[Libreoffice-commits] core.git: config_host.mk.in configure.ac
config_host.mk.in |1 - configure.ac |1 - 2 files changed, 2 deletions(-) New commits: commit 35fdbea1a112c0f0bf8ea6e9003cf0e13b9cd886 Author: Tor Lillqvist t...@iki.fi Date: Tue May 14 21:20:29 2013 +0300 FRAMEWORKSHOME is not used outside configure.ac Change-Id: Ic8eae6d7e9590ad75c414568877aa093c92ce536 diff --git a/config_host.mk.in b/config_host.mk.in index 02da41e..dd27847 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -173,7 +173,6 @@ export FLEX=@FLEX@ export FLUTE_JAR=@FLUTE_JAR@ export FONTCONFIG_CFLAGS=$(gb_SPACE)@FONTCONFIG_CFLAGS@ export FONTCONFIG_LIBS=$(gb_SPACE)@FONTCONFIG_LIBS@ -export FRAMEWORKSHOME=@FRAMEWORKSHOME@ export FREETYPE_CFLAGS=$(gb_SPACE)@FREETYPE_CFLAGS@ export FREETYPE_LIBS=$(gb_SPACE)@FREETYPE_LIBS@ export GCONF_CFLAGS=$(gb_SPACE)@GCONF_CFLAGS@ diff --git a/configure.ac b/configure.ac index f35d2da..60b0e9c 100644 --- a/configure.ac +++ b/configure.ac @@ -2620,7 +2620,6 @@ if test $_os = Darwin; then AC_MSG_RESULT([$MACOSX_BUNDLE_IDENTIFIER]) fi -AC_SUBST(FRAMEWORKSHOME) AC_SUBST(MACOSX_SDK_PATH) AC_SUBST(MACOSX_SDK_VERSION) AC_SUBST(MACOSX_DEPLOYMENT_TARGET) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/svtools svtools/source
include/svtools/fmtfield.hxx|1 +
svtools/source/control/fmtfield.cxx | 26 +++---
2 files changed, 20 insertions(+), 7 deletions(-)
New commits:
commit 9c3420d18173fd6c9380cf8ff7e2a4ad886e9e0b
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Wed May 15 07:24:43 2013 +0200
svtools FormattedField: don't reparse value from text after ReFormat
If our format is lossy / not a bijection
(as is e.g. our default date format, because of 2-digit year),
then reparsing the string that came from the format
leads to data loss (the value is changed to something else).
The existing code tried to do that, by calling Modify()
and then setting m_bValueDirty to false.
However, this fails because listeners are called
while m_bValueDirty is true. If any of them calls
e.g. GetValue(), the reparse happens.
Change-Id: I272f377927f83c71ede1eb80eafbc689f36fb17a
diff --git a/include/svtools/fmtfield.hxx b/include/svtools/fmtfield.hxx
index 8486926..6fab7e4 100644
--- a/include/svtools/fmtfield.hxx
+++ b/include/svtools/fmtfield.hxx
@@ -236,6 +236,7 @@ public:
protected:
virtual long Notify(NotifyEvent rNEvt);
+void impl_Modify(bool makeValueDirty = true);
virtual void Modify();
// CheckText ueberschreiben fuer Ueberpruefung zur Eingabezeit
diff --git a/svtools/source/control/fmtfield.cxx
b/svtools/source/control/fmtfield.cxx
index 53ccc33..7e04e8c 100644
--- a/svtools/source/control/fmtfield.cxx
+++ b/svtools/source/control/fmtfield.cxx
@@ -487,13 +487,14 @@ void FormattedField::SetAutoColor(sal_Bool _bAutomatic)
}
//--
-void FormattedField::Modify()
+void FormattedField::impl_Modify(bool makeValueDirty)
{
DBG_CHKTHIS(FormattedField, NULL);
if (!IsStrictFormat())
{
-m_bValueDirty = sal_True;
+if(makeValueDirty)
+m_bValueDirty = sal_True;
SpinField::Modify();
return;
}
@@ -503,7 +504,8 @@ void FormattedField::Modify()
{
m_sLastValidText = sCheck;
m_aLastSelection = GetSelection();
-m_bValueDirty = sal_True;
+if(makeValueDirty)
+m_bValueDirty = sal_True;
}
else
{
@@ -514,6 +516,14 @@ void FormattedField::Modify()
}
//--
+void FormattedField::Modify()
+{
+DBG_CHKTHIS(FormattedField, NULL);
+
+impl_Modify();
+}
+
+//--
void FormattedField::ImplSetTextImpl(const OUString rNew, Selection* pNewSel)
{
DBG_CHKTHIS(FormattedField, NULL);
@@ -789,10 +799,12 @@ void FormattedField::Commit()
// did the text change?
if ( GetText() != sOld )
-{ // consider the field as modified
-Modify();
-// but we have the most recent value now
-m_bValueDirty = sal_False;
+{ // consider the field as modified,
+// but we already have the most recent value;
+// don't reparse it from the text
+// (can lead to data loss when the format is lossy,
+// as is e.g. our default date format: 2-digit year!)
+impl_Modify(false);
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - oox/source
oox/source/ppt/extdrawingfragmenthandler.cxx |7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 2904e4d618a57771662ef435df0f478423714e41
Author: Thorsten Behrens tbehr...@suse.com
Date: Wed May 15 01:28:50 2013 +0200
Fix fdo#64579 Don't assume dsp:dataModelExt has valid DrawingML.
Just don't assume the DSP_TOKEN( spTree ) was seen in input.
Change-Id: Iaabdcafdfcfc995198c1265e975df4dde8e0a39c
(cherry picked from commit 0f15a477aaba2f69a13c0bc61c5c8c7a47314680)
Reviewed-on: https://gerrit.libreoffice.org/3910
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/oox/source/ppt/extdrawingfragmenthandler.cxx
b/oox/source/ppt/extdrawingfragmenthandler.cxx
index f065415..dc62bd6 100644
--- a/oox/source/ppt/extdrawingfragmenthandler.cxx
+++ b/oox/source/ppt/extdrawingfragmenthandler.cxx
@@ -86,8 +86,11 @@ ExtDrawingFragmentHandler::createFastChildContext(
::sal_Int32 aElement,
}
void SAL_CALL ExtDrawingFragmentHandler::endDocument() throw
(::com::sun::star::xml::sax::SAXException,
::com::sun::star::uno::RuntimeException)
{
-mpShapePtr-moveAllToPosition( mpOrgShapePtr-getPosition() );
-mpShapePtr-setName( mpOrgShapePtr-getName() );
+if( mpShapePtr )
+{
+mpShapePtr-moveAllToPosition( mpOrgShapePtr-getPosition() );
+mpShapePtr-setName( mpOrgShapePtr-getName() );
+}
}
} }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] fdo#64011 fix the position and the drawing from left to righ...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3912
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/12/3912/1
fdo#64011 fix the position and the drawing from left to right in RTL sheet
this will fix the start position for drawing and you can draw shapes
from left to right when the Sheet are RTL
Change-Id: I5cc8eabf474918968bea026dba9c5add2bb4f28e
---
M sc/source/ui/drawfunc/fuconstr.cxx
1 file changed, 7 insertions(+), 0 deletions(-)
diff --git a/sc/source/ui/drawfunc/fuconstr.cxx
b/sc/source/ui/drawfunc/fuconstr.cxx
index 5d8f270..381aeb4 100644
--- a/sc/source/ui/drawfunc/fuconstr.cxx
+++ b/sc/source/ui/drawfunc/fuconstr.cxx
@@ -83,6 +83,7 @@
// involved. Lets calculate where aPos would be at 100% zoom
// that's the actual correct position for the object ( when you
// restore the zoom.
+sal_Bool bNegative = pDoc-IsNegativePage(pView-GetTab());
Rectangle aObjRect( rInOutPos, rInOutPos );
ScRange aRange = pDoc-GetRange( pView-GetTab(), aObjRect );
ScAddress aOldStt = aRange.aStart;
@@ -98,6 +99,12 @@
Point aOff = ( rInOutPos - aCurPosHmm );
rInOutPos = aOldPos + aOff;
aRetGridOff = aCurPosHmm - aOldPos;
+// fdo#64011 fix the X position when the sheet are RTL
+if ( bNegative )
+{
+aRetGridOff.setX( aCurPosHmm.getX() + aOldPos.getX() );
+rInOutPos.setX( aOff.getX() - aOldPos.getX() );
+}
}
return aRetGridOff;
}
--
To view, visit https://gerrit.libreoffice.org/3912
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5cc8eabf474918968bea026dba9c5add2bb4f28e
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Faisal al-otaibi fmalota...@kacst.edu.sa
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED libreoffice-4-0] Fix fdo#64579 Don't assume dsp:dataModelExt has valid Drawin...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3910 Approvals: Fridrich Strba: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3910 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iaabdcafdfcfc995198c1265e975df4dde8e0a39c Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Thorsten Behrens tbehr...@suse.com Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 10 commits - config_host.mk.in configure.ac svx/source
config_host.mk.in |9 -
configure.ac | 23 ---
svx/source/gallery2/galobj.cxx |2 --
3 files changed, 34 deletions(-)
New commits:
commit c909d7a7ee3b193af69546a6f0e98860cd4877bf
Author: Tor Lillqvist t...@iki.fi
Date: Wed May 15 09:09:13 2013 +0300
Fix warning: unused variable 'aWhite' [loplugin]
Change-Id: Ic25f9e6b2cfc902745cbef97b3164f33c6e03f9a
diff --git a/svx/source/gallery2/galobj.cxx b/svx/source/gallery2/galobj.cxx
index 29791da..462d8cc 100644
--- a/svx/source/gallery2/galobj.cxx
+++ b/svx/source/gallery2/galobj.cxx
@@ -66,8 +66,6 @@ sal_Bool SgaObject::CreateThumb( const Graphic rGraphic )
if( aBmpSize.Width() aBmpSize.Height() )
{
-const Color aWhite( COL_WHITE );
-
if( aBmpEx.GetPrefMapMode().GetMapUnit() != MAP_PIXEL
aBmpEx.GetPrefSize().Width() 0
aBmpEx.GetPrefSize().Height() 0 )
commit 49ff95f0c1d0ee20bfccba648cfd7c1db47158a3
Author: Tor Lillqvist t...@iki.fi
Date: Wed May 15 08:41:30 2013 +0300
LIBMGR_X64_BINARY is unused
Change-Id: Ic3ea17a66d8cc045088ce2a625a79569c8fec431
diff --git a/config_host.mk.in b/config_host.mk.in
index 1011dd3..ada0151b 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -291,7 +291,6 @@ export LIBLANGTAG_CFLAGS=$(gb_SPACE)@LIBLANGTAG_CFLAGS@
export LIBLANGTAG_LIBS=$(gb_SPACE)@LIBLANGTAG_LIBS@
export LIBLAYOUT_JAR=@LIBLAYOUT_JAR@
export LIBLOADER_JAR=@LIBLOADER_JAR@
-export LIBMGR_X64_BINARY=@LIBMGR_X64_BINARY@
export LIBO_THIS_YEAR=@LIBO_THIS_YEAR@
export LIBO_VERSION_MAJOR=@LIBO_VERSION_MAJOR@
export LIBO_VERSION_MICRO=@LIBO_VERSION_MICRO@
diff --git a/configure.ac b/configure.ac
index 5f89212..31e07e4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3164,7 +3164,6 @@ if test $_os = WINNT; then
BUILD_X64=
CXX_X64_BINARY=
LINK_X64_BINARY=
-LIBMGR_X64_BINARY=
if test $BITNESS_OVERRIDE = ; then
AC_MSG_CHECKING([for a x64 compiler and libraries for 64-bit
Explorer extensions])
@@ -3175,12 +3174,10 @@ if test $_os = WINNT; then
BUILD_X64=TRUE
CXX_X64_BINARY=$VC_PRODUCT_DIR/bin/amd64/cl.exe
LINK_X64_BINARY=$VC_PRODUCT_DIR/bin/amd64/link.exe
-LIBMGR_X64_BINARY=$VC_PRODUCT_DIR/bin/amd64/lib.exe
elif $VC_PRODUCT_DIR/bin/x86_amd64/cl.exe -? /dev/null
/dev/null 21; then
BUILD_X64=TRUE
CXX_X64_BINARY=$VC_PRODUCT_DIR/bin/x86_amd64/cl.exe
LINK_X64_BINARY=$VC_PRODUCT_DIR/bin/x86_amd64/link.exe
-LIBMGR_X64_BINARY=$VC_PRODUCT_DIR/bin/x86_amd64/lib.exe
fi
fi
if test $BUILD_X64 = TRUE; then
@@ -3195,8 +3192,6 @@ if test $_os = WINNT; then
# These are passed to the environment and then used in
gbuild/platform/com_MSC_class.mk
AC_SUBST(CXX_X64_BINARY)
AC_SUBST(LINK_X64_BINARY)
-AC_SUBST(LIBMGR_X64_BINARY)
-
else
AC_MSG_CHECKING([the compiler is MinGW])
MACHINE_PREFIX=`$CC -dumpmachine`
commit 8906309a363c53b72f90ef904a49e8eaf12bdb3b
Author: Tor Lillqvist t...@iki.fi
Date: Wed May 15 08:33:55 2013 +0300
JAVACISKAFFE is unused
Change-Id: Id3bc14b65e761dc230491dd8cf4c3785a0eaa37e
diff --git a/config_host.mk.in b/config_host.mk.in
index 4c9beb9..1011dd3 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -250,7 +250,6 @@ export INSTDIR=@INSTDIR@
export INSTALLDIR=@INSTALLDIR@
export INSTALLDIRNAME=@INSTALLDIRNAME@
export JAVACISGCJ=@JAVACISGCJ@
-export JAVACISKAFFE=@JAVACISKAFFE@
export JAVACOMPILER=@JAVACOMPILER@
export JAVADOC=@JAVADOC@
export JAVADOCISGJDOC=@JAVADOCISGJDOC@
diff --git a/configure.ac b/configure.ac
index 2abcefa..5f89212 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6289,17 +6289,6 @@ if test $SOLAR_JAVA != ; then
fi
AC_SUBST(JAVACISGCJ)
-JAVACISKAFFE=
-dnl ===
-dnl Checks that javac is kaffe
-dnl ===
-if test $SOLAR_JAVA != ; then
-if test `$JAVACOMPILER -version 21 | $GREP -c Kaffe` -gt 0; then
-JAVACISKAFFE=yes
-fi
-fi
-AC_SUBST(JAVACISKAFFE)
-
dnl ===
dnl Checks for javadoc
dnl ===
commit 9922ec862ece36eef9c2a8576ba785326b93a021
Author: Tor Lillqvist t...@iki.fi
Date: Wed May 15 08:29:19 2013 +0300
DYNAMIC_CRT is unused
Change-Id: Iabeec6542d18f773a0ae5781214ec7d4ce02b3ab
diff --git a/config_host.mk.in b/config_host.mk.in
index ed82869..4c9beb9 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -103,7 +103,6 @@ export DOCDIR=@DOCDIR@
export DOXYGEN=@DOXYGEN@
export
[Libreoffice-commits] core.git: 6 commits - basctl/source basic/source cui/source offapi/com offapi/UnoApi_offapi.mk sw/inc sw/source xmloff/source
basctl/source/dlged/dlged.cxx |9 -
basic/source/uno/dlgcont.cxx | 47 -
cui/source/customize/cfgutil.cxx |5 -
cui/source/customize/selector.cxx |4
cui/source/dialogs/hyphen.cxx | 10 --
cui/source/dialogs/scriptdlg.cxx |6 -
cui/source/inc/optlingu.hxx|3
cui/source/options/optgdlg.cxx |8 -
cui/source/options/optlingu.cxx|2
cui/source/options/treeopt.cxx | 10 --
offapi/UnoApi_offapi.mk|5 -
offapi/com/sun/star/chart2/RegressionEquation.idl | 35 +++
offapi/com/sun/star/script/browse/BrowseNodeFactory.idl|1
offapi/com/sun/star/script/browse/theBrowseNodeFactory.idl |7 -
sw/inc/swtypes.hxx |3
sw/source/core/bastyp/swtypes.cxx |2
sw/source/core/doc/docedt.cxx |1
sw/source/core/edit/edlingu.cxx|1
sw/source/core/txtnode/txtedt.cxx |2
sw/source/ui/lingu/hyp.cxx |6 -
sw/source/ui/uiview/view0.cxx |5 -
sw/source/ui/uiview/viewling.cxx | 14 +-
xmloff/source/chart/SchXMLPlotAreaContext.cxx | 64 +
xmloff/source/draw/animationimport.cxx | 11 +-
xmloff/source/draw/shapeexport.cxx |7 -
xmloff/source/transform/OOo2Oasis.cxx | 24 ++--
26 files changed, 131 insertions(+), 161 deletions(-)
New commits:
commit 3e563377333881efa60aaa93d2feeaf647cf19ff
Author: Noel Grandin n...@peralex.com
Date: Tue May 14 15:54:42 2013 +0200
fdo#46808, More LinguProperties fun
Change-Id: Ia3173e980370f532fcabc8f1c7a913e5d66d6d8a
diff --git a/cui/source/dialogs/hyphen.cxx b/cui/source/dialogs/hyphen.cxx
index e7bfc03..7e4e724 100644
--- a/cui/source/dialogs/hyphen.cxx
+++ b/cui/source/dialogs/hyphen.cxx
@@ -360,19 +360,15 @@ IMPL_LINK( SvxHyphenWordDialog, HyphenateAllHdl_Impl,
Button *, EMPTYARG /*pButt
{
try
{
-uno::Reference beans::XPropertySet xProp(
SvxGetLinguPropertySet() );
-const OUString aName( IsHyphAuto );
-uno::Any aAny;
+uno::Reference linguistic2::XLinguProperties xProp(
SvxGetLinguPropertySet() );
-aAny = sal_True;
-xProp-setPropertyValue( aName, aAny );
+xProp-setIsHyphAuto( sal_True );
bBusy = sal_True;
ContinueHyph_Impl( /*nHyphPos*/nOldPos );
bBusy = sal_False;
-aAny = sal_False;
-xProp-setPropertyValue( aName, aAny );
+xProp-setIsHyphAuto( sal_False );
}
catch (uno::Exception e)
{
diff --git a/cui/source/inc/optlingu.hxx b/cui/source/inc/optlingu.hxx
index abafc39..ee6c51c 100644
--- a/cui/source/inc/optlingu.hxx
+++ b/cui/source/inc/optlingu.hxx
@@ -38,6 +38,7 @@ namespace beans{
namespace linguistic2{
class XDictionary;
class XDictionaryList;
+class XLinguProperties;
class SvTreeListEntry;
@@ -123,7 +124,7 @@ private:
String sHyphSpecial;
com::sun::star::uno::Reference
-com::sun::star::beans::XPropertySetxProp;
+com::sun::star::linguistic2::XLinguProperties xProp;
com::sun::star::uno::Reference
com::sun::star::linguistic2::XDictionaryList xDicList;
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 86e6f48..7a3a9e3 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -1349,7 +1349,7 @@ sal_Bool OfaLanguagesTabPage::FillItemSet( SfxItemSet
rSet )
pLangConfig-aSysLocaleOptions.SetDatePatternsConfigString(
aDatePatternsED.GetText());
SfxObjectShell* pCurrentDocShell = SfxObjectShell::Current();
-Reference XPropertySet xLinguProp( LinguMgr::GetLinguPropertySet(),
UNO_QUERY );
+Reference css::linguistic2::XLinguProperties xLinguProp =
LinguMgr::GetLinguPropertySet();
sal_Bool bCurrentDocCBChecked = aCurrentDocCB.IsChecked();
if(aCurrentDocCB.IsEnabled())
bLanguageCurrentDoc_Impl = bCurrentDocCBChecked;
@@ -1367,7 +1367,7 @@ sal_Bool OfaLanguagesTabPage::FillItemSet( SfxItemSet
rSet )
OUString aPropName( DefaultLocale );
pLangConfig-aLinguConfig.SetProperty( aPropName, aValue );
if (xLinguProp.is())
-xLinguProp-setPropertyValue( aPropName, aValue );
+xLinguProp-setDefaultLocale( aLocale );
}
if(pCurrentDocShell)
{
@@
[Libreoffice-commits] core.git: 10 commits - config_host.mk.in configure.ac distro-configs/LibreOfficeLinux.conf distro-configs/LibreOfficeOpenBSD.conf distro-configs/OxygenOfficeLinux.conf include/sa
config_host.mk.in |7 - configure.ac | 44 + distro-configs/LibreOfficeLinux.conf |1 distro-configs/LibreOfficeOpenBSD.conf |1 distro-configs/OxygenOfficeLinux.conf |1 include/sal/log-areas.dox |1 6 files changed, 3 insertions(+), 52 deletions(-) New commits: commit 5b9c27b6e5def4b55cd832626624c6c41df08989 Author: Tor Lillqvist t...@iki.fi Date: Wed May 15 09:52:05 2013 +0300 Also just xmloff is (misguidedly?) used as a log area nowadays Change-Id: I5af86a56b723d5f4b706cc8af6e1b25faf918469 diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox index 9257dee..a570731 100644 --- a/include/sal/log-areas.dox +++ b/include/sal/log-areas.dox @@ -302,6 +302,7 @@ certain functionality. @section xmloff +@li @c xmloff @li @c xmloff.core @li @c xmloff.draw @li @c xmloff.forms commit f3f6c11ee2da108ab5c0d54979d7925f9175a6b6 Author: Tor Lillqvist t...@iki.fi Date: Wed May 15 09:41:57 2013 +0300 No idea what use_shl_version is Change-Id: I85ae4a65c32fda4b6cf79e0e9ed1c3add3941364 diff --git a/configure.ac b/configure.ac index eaaf34b..21384ee 100644 --- a/configure.ac +++ b/configure.ac @@ -441,7 +441,6 @@ cygwin*|interix*|mingw32*) test_freetype=no test_fontconfig=no _os=WINNT -use_shl_version=TRUE DLLPOST=.dll LINKFLAGSNOUNDEFS= @@ -615,8 +614,6 @@ if test $_os = AIX; then fi fi -AC_SUBST(use_shl_version) - AC_SUBST(WITH_MINGW) AC_SUBST(OSVERSION) AC_SUBST(PTHREAD_CFLAGS) commit df54f97aaf613714d785461859a35fdf7a80 Author: Tor Lillqvist t...@iki.fi Date: Wed May 15 09:38:31 2013 +0300 UNIXWRAPPERNAME is unused Change-Id: Ic25acc8413960c2268b5fffc287e8e4f3165a767 diff --git a/config_host.mk.in b/config_host.mk.in index 2b1d189..c731167 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -518,7 +518,6 @@ export THES_SYSTEM_DIR=@THES_SYSTEM_DIR@ export TLS=@TLS@ export TMPDIR=@TEMP_DIRECTORY@ export TYPO_EXTENSION_PACK=@TYPO_EXTENSION_PACK@ -export UNIXWRAPPERNAME=@UNIXWRAPPERNAME@ export UNOWINREG_DLL=@UNOWINREG_DLL@ export UPD=@UPD@ export URELIBS=@URELIBS@ diff --git a/configure.ac b/configure.ac index be86374..eaaf34b 100644 --- a/configure.ac +++ b/configure.ac @@ -1828,15 +1828,6 @@ AC_ARG_WITH(vendor, ], ,) -AC_ARG_WITH(unix-wrapper, -AS_HELP_STRING([--with-unix-wrapper], -[Redefines the name of the UNIX wrapper that will be used in the desktop - files and in the desktop-integration RPMs.]) -[ - Usage: --with-unix-wrapper=ooffice -], -,) - AC_ARG_WITH(compat-oowrappers, AS_HELP_STRING([--with-compat-oowrappers], [Install oo* wrappers in parallel with @@ -11513,16 +11504,6 @@ else fi AC_SUBST(OOO_VENDOR) -UNIXWRAPPERNAME= -AC_MSG_CHECKING([for UNIX wrapper name]) -if test -z $with_unix_wrapper -o $with_unix_wrapper = no -o $with_unix_wrapper = yes; then -AC_MSG_RESULT([not set]) -else -UNIXWRAPPERNAME=$with_unix_wrapper -AC_MSG_RESULT([$UNIXWRAPPERNAME]) -fi -AC_SUBST(UNIXWRAPPERNAME) - AC_MSG_CHECKING([whether to install the compat oo* wrappers]) if test $with_compat_oowrappers = yes; then WITH_COMPAT_OOWRAPPERS=YES diff --git a/distro-configs/LibreOfficeLinux.conf b/distro-configs/LibreOfficeLinux.conf index 1b841e4..d9cd2d7 100644 --- a/distro-configs/LibreOfficeLinux.conf +++ b/distro-configs/LibreOfficeLinux.conf @@ -1,7 +1,6 @@ --with-vendor=The Document Foundation --with-system-dicts --with-myspell-dicts ---without-unix-wrapper --with-system-zlib --without-system-poppler --without-system-openssl diff --git a/distro-configs/LibreOfficeOpenBSD.conf b/distro-configs/LibreOfficeOpenBSD.conf index 3492b7e..9967da5 100644 --- a/distro-configs/LibreOfficeOpenBSD.conf +++ b/distro-configs/LibreOfficeOpenBSD.conf @@ -37,6 +37,5 @@ --with-system-zlib --with-vendor=The OpenBSD project --without-junit ---without-unix-wrapper --without-system-libwpd --with-help diff --git a/distro-configs/OxygenOfficeLinux.conf b/distro-configs/OxygenOfficeLinux.conf index 91da226..7a3da9c 100644 --- a/distro-configs/OxygenOfficeLinux.conf +++ b/distro-configs/OxygenOfficeLinux.conf @@ -20,7 +20,6 @@ --enable-gtk --enable-evolution2 --enable-lockdown ---with-unix-wrapper --with-fonts --enable-extra-gallery --enable-extra-template commit 9c402abdd5e12fca6f0cc8fc41e6b248866cbb67 Author: Tor Lillqvist t...@iki.fi Date: Wed May 15 09:34:16 2013 +0300 What is PSPRINT, seems unused Change-Id: Ib194156122c91a8911b748004e658835986ffc67 diff --git a/config_host.mk.in b/config_host.mk.in index 3fc5474..2b1d189 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -408,7 +408,6 @@ export PROGRESSPOSITION=@PROGRESSPOSITION@ export PROGRESSSIZE=@PROGRESSSIZE@ export PROGRESSTEXTBASELINE=@PROGRESSTEXTBASELINE@ export
[Libreoffice-commits] core.git: include/filter sd/qa sd/source
include/filter/msfilter/svdfppt.hxx |2 +-
sd/qa/unit/data/fdo64586.ppt|binary
sd/qa/unit/data/xml/fdo64586_0.xml | 31 +++
sd/qa/unit/import-tests.cxx |3 ++-
sd/source/filter/ppt/pptin.cxx |3 +--
5 files changed, 35 insertions(+), 4 deletions(-)
New commits:
commit 1a357b7394ac7b48b72821bff1aae4706265d7a4
Author: Jan Holesovsky ke...@suse.cz
Date: Wed May 15 09:37:27 2013 +0200
fdo#64586: Fix incorrect import non-empty placeholders + unit test.
Change-Id: Ibcb61dfa12c67fd9f93713ba7eb93f947b122f07
diff --git a/include/filter/msfilter/svdfppt.hxx
b/include/filter/msfilter/svdfppt.hxx
index 6fc22af..c32b9de 100644
--- a/include/filter/msfilter/svdfppt.hxx
+++ b/include/filter/msfilter/svdfppt.hxx
@@ -1199,7 +1199,7 @@ struct ImplPPTTextObj
explicit ImplPPTTextObj( PptSlidePersistEntry rPersistEntry ) :
mrPersistEntry ( rPersistEntry ) {};
};
-class PPTTextObj
+class MSFILTER_DLLPUBLIC PPTTextObj
{
ImplPPTTextObj* mpImplTextObj;
voidImplClear();
diff --git a/sd/qa/unit/data/fdo64586.ppt b/sd/qa/unit/data/fdo64586.ppt
new file mode 100644
index 000..62a4b11
Binary files /dev/null and b/sd/qa/unit/data/fdo64586.ppt differ
diff --git a/sd/qa/unit/data/xml/fdo64586_0.xml
b/sd/qa/unit/data/xml/fdo64586_0.xml
new file mode 100644
index 000..695fbd9
--- /dev/null
+++ b/sd/qa/unit/data/xml/fdo64586_0.xml
@@ -0,0 +1,31 @@
+?xml version=1.0?
+XShapes
+ XShape positionX=1397 positionY=963 sizeX=25197 sizeY=3508
type=com.sun.star.presentation.TitleTextShape textAutoGrowHeight=true
textAutoGrowWidth=false textContourFrame=false textFitToSize=NONE
textHorizontalAdjust=BLOCK textVerticalAdjust=CENTER textLeftDistance=0
textRightDistance=0 textUpperDistance=0 textLowerDistance=0
textMaximumFrameHeight=0 textMaximumFrameWidth=0
textMinimumFrameHeight=3508 textMinimumFrameWidth=0 textAnimationAmount=0
textAnimationCount=0 textAnimationDelay=0 textAnimationDirection=LEFT
textAnimationKind=NONE textAnimationStartInside=false
textAnimationStopInside=false textWritingMode=LR_TB fillStyle=NONE
fillColor=16777215 fillTransparence=0 fillTransparenceGradientName=
+ FillTransparenceGradient style=LINEAR startColor=0 endColor=16777215
angle=0 border=0 xOffset=50 yOffset=50 startIntensity=100
endIntensity=100 stepCount=0/
+ FillGradient style=LINEAR startColor=0 endColor=16777215 angle=0
border=0 xOffset=50 yOffset=50 startIntensity=100 endIntensity=100
stepCount=0/
+ FillHatch style=SINGLE color=3433903 distance=20 angle=0/
+ FillBitmap/
+ LineDash style=RECT dots=1 dotLen=20 dashes=1 dashLen=20
distance=20/
+ LineStart/
+ LineEnd/
+ Transformation
+ Line1 column1=25198.00 column2=0.00 column3=1397.00/
+ Line2 column1=0.00 column2=3509.00 column3=963.00/
+ Line3 column1=0.00 column2=0.00 column3=1.00/
+ /Transformation
+ /XShape
+ XShape positionX=1397 positionY=4912 sizeX=25197 sizeY=12181
type=com.sun.star.presentation.SubtitleShape text=Blah
textAutoGrowHeight=true textAutoGrowWidth=false textContourFrame=false
textFitToSize=NONE textHorizontalAdjust=BLOCK textVerticalAdjust=CENTER
textLeftDistance=0 textRightDistance=0 textUpperDistance=78
textLowerDistance=0 textMaximumFrameHeight=0 textMaximumFrameWidth=0
textMinimumFrameHeight=12103 textMinimumFrameWidth=0
textAnimationAmount=0 textAnimationCount=0 textAnimationDelay=0
textAnimationDirection=LEFT textAnimationKind=NONE
textAnimationStartInside=false textAnimationStopInside=false
textWritingMode=LR_TB fillStyle=NONE fillColor=16777215
fillTransparence=0 fillTransparenceGradientName=
+ FillTransparenceGradient style=LINEAR startColor=0 endColor=16777215
angle=0 border=0 xOffset=50 yOffset=50 startIntensity=100
endIntensity=100 stepCount=0/
+ FillGradient style=LINEAR startColor=0 endColor=16777215 angle=0
border=0 xOffset=50 yOffset=50 startIntensity=100 endIntensity=100
stepCount=0/
+ FillHatch style=SINGLE color=3433903 distance=20 angle=0/
+ FillBitmap/
+ LineDash style=RECT dots=1 dotLen=20 dashes=1 dashLen=20
distance=20/
+ LineStart/
+ LineEnd/
+ Transformation
+ Line1 column1=25198.00 column2=0.00 column3=1397.00/
+ Line2 column1=0.00 column2=12182.00 column3=4912.00/
+ Line3 column1=0.00 column2=0.00 column3=1.00/
+ /Transformation
+ /XShape
+/XShapes
diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx
index 0c6d8a7..d8c8204 100644
--- a/sd/qa/unit/import-tests.cxx
+++ b/sd/qa/unit/import-tests.cxx
@@ -53,7 +53,8 @@ void SdFiltersTest::testDocumentLayout()
{
{ odp/shapes-test.odp, xml/shapes-test_page },
{ pptx/fdo47434-all.pptx, pptx/xml/fdo47434_page },
-{ n758621.ppt, xml/n758621_ }
+{ n758621.ppt, xml/n758621_ },
+{ fdo64586.ppt, xml/fdo64586_ }
};
for ( int i = 0; i static_cast int ( SAL_N_ELEMENTS( aFilesToCompare )
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 Bug 60270 depends on bug 64586, which changed state. Bug 64586 Summary: PPT does not import text in placeholders https://bugs.freedesktop.org/show_bug.cgi?id=64586 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED -- 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
[Libreoffice-commits] core.git: Branch 'distro/suse/suse-3.6' - filter/inc sd/source
filter/inc/filter/msfilter/svdfppt.hxx |2 +-
sd/source/filter/ppt/pptin.cxx |3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
New commits:
commit fa51b81053cca46bc08d4e096314f08e681bf61c
Author: Jan Holesovsky ke...@suse.cz
Date: Wed May 15 09:37:27 2013 +0200
fdo#64586: Fix incorrect import non-empty placeholders.
Change-Id: Ibcb61dfa12c67fd9f93713ba7eb93f947b122f07
diff --git a/filter/inc/filter/msfilter/svdfppt.hxx
b/filter/inc/filter/msfilter/svdfppt.hxx
index da82d7f..5c6baa9 100644
--- a/filter/inc/filter/msfilter/svdfppt.hxx
+++ b/filter/inc/filter/msfilter/svdfppt.hxx
@@ -1199,7 +1199,7 @@ struct ImplPPTTextObj
ImplPPTTextObj( PptSlidePersistEntry rPersistEntry ) : mrPersistEntry (
rPersistEntry ) {};
};
-class PPTTextObj
+class MSFILTER_DLLPUBLIC PPTTextObj
{
ImplPPTTextObj* mpImplTextObj;
voidImplClear();
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index c4ab6d2..ef0cf2b 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -2340,6 +2340,7 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj*
pTextObj, SdrTextObj* pObj
sal_BoolbVertical = sal_False;
if ( ( pTextObj-GetShapeType() == mso_sptRectangle ) || (
pTextObj-GetShapeType() == mso_sptTextBox ) )
{
+bEmptyPresObj = ( pTextObj-Count() == 0 ) || (
pTextObj-Count() == 1 pTextObj-First()-GetTextSize() == 0 );
switch ( nPlaceholderId )
{
case PPT_PLACEHOLDER_NOTESBODY :
ePresObjKind = PRESOBJ_NOTES; break;
@@ -2366,8 +2367,6 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj*
pTextObj, SdrTextObj* pObj
case
PPT_PLACEHOLDER_ORGANISZATIONCHART : ePresObjKind = PRESOBJ_ORGCHART; break;
}
}
-else
-bEmptyPresObj = sal_False;
};
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0' - filter/inc sd/source
filter/inc/filter/msfilter/svdfppt.hxx |2 +-
sd/source/filter/ppt/pptin.cxx |3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
New commits:
commit 87018a47b879bdf942e4ac4124a161aab928806d
Author: Jan Holesovsky ke...@suse.cz
Date: Wed May 15 09:37:27 2013 +0200
fdo#64586: Fix incorrect import non-empty placeholders.
Change-Id: Ibcb61dfa12c67fd9f93713ba7eb93f947b122f07
diff --git a/filter/inc/filter/msfilter/svdfppt.hxx
b/filter/inc/filter/msfilter/svdfppt.hxx
index cb34b9a..0b00886 100644
--- a/filter/inc/filter/msfilter/svdfppt.hxx
+++ b/filter/inc/filter/msfilter/svdfppt.hxx
@@ -1190,7 +1190,7 @@ struct ImplPPTTextObj
explicit ImplPPTTextObj( PptSlidePersistEntry rPersistEntry ) :
mrPersistEntry ( rPersistEntry ) {};
};
-class PPTTextObj
+class MSFILTER_DLLPUBLIC PPTTextObj
{
ImplPPTTextObj* mpImplTextObj;
voidImplClear();
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index 1e15c3d..84bd8f6 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -2321,6 +2321,7 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj*
pTextObj, SdrTextObj* pObj
sal_BoolbVertical = sal_False;
if ( ( pTextObj-GetShapeType() == mso_sptRectangle ) || (
pTextObj-GetShapeType() == mso_sptTextBox ) )
{
+bEmptyPresObj = ( pTextObj-Count() == 0 ) || (
pTextObj-Count() == 1 pTextObj-First()-GetTextSize() == 0 );
switch ( nPlaceholderId )
{
case PPT_PLACEHOLDER_NOTESBODY :
ePresObjKind = PRESOBJ_NOTES; break;
@@ -2347,8 +2348,6 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj*
pTextObj, SdrTextObj* pObj
case
PPT_PLACEHOLDER_ORGANISZATIONCHART : ePresObjKind = PRESOBJ_ORGCHART; break;
}
}
-else
-bEmptyPresObj = sal_False;
};
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [PUSHED] Use clock_gettime instead of gettimeofday to have more preci...
On 05/13/2013 06:59 PM, Norbert Thiebaud (via Code Review) wrote: Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3841 Just saw the hotspot-...@openjdk.java.net thread Mac OS X System.nanoTime Improvements starting at http://mail.openjdk.java.net/pipermail/hotspot-dev/2013-May/009496.html that might be interesting for us, too. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/qa writerfilter/source
sw/qa/extras/rtfimport/data/fdo62977.rtf | 24
sw/qa/extras/rtfimport/rtfimport.cxx |8
writerfilter/source/rtftok/rtfdocumentimpl.cxx |5 -
3 files changed, 36 insertions(+), 1 deletion(-)
New commits:
commit 4a816a816e8b4e213394898bd0e307dd90fcbb64
Author: Miklos Vajna vmik...@suse.cz
Date: Wed May 15 09:59:18 2013 +0200
fdo#62977 allow SAL_MAX_INT16..SAL_MAX_UINT16 when importing RTF_U
Change-Id: Ie36d5881b0ebe8c38526690ca27d02bfb7af7829
diff --git a/sw/qa/extras/rtfimport/data/fdo62977.rtf
b/sw/qa/extras/rtfimport/data/fdo62977.rtf
new file mode 100644
index 000..f16135d
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/fdo62977.rtf
@@ -0,0 +1,24 @@
+{\rtf1 \ansi
+{\fonttbl;
+{
+\f0 \'41\'72\'69\'61\'6c;}
+{
+\f1 \'53\'79\'6d\'62\'6f\'6c;}
+{
+\f2 \'54\'69\'6d\'65\'73\'20\'4e\'65\'77\'20\'52\'6f\'6d\'61\'6e;}
+{
+\f3 \'82\'6c\'82\'72\'20\'96\'be\'92\'a9;}
+}
+{\*\generator Apache XML Graphics RTF Library;}
+\fet0 \ftnbj \paperw11905 \paperh16837 \margt1984 \margb1700 \margl1700
\margr1700 \itap0 \sectd \headery720 \footery720 \stextflow0 \cols1
+{\ri0 \li0
+{\qr \b0 \fi0 \cf1 \loch\af3 \hich\af3 \dbch\f3 \ri0 \sl420 \i0 \li0 \fs21
+{\b0 \cf1 \loch\af3 \hich\af3 \dbch\f3 \i0 \fs21
+{\strike0 \b0 \cf1 \loch\af3 \hich\af3 \dbch\f3 \ul0 \i0 \fs21 \sa0 \sb0
+\u24180\'3f\u65300\'3f\u26376\'3f
+\par
+}
+}
+}
+}
+}
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx
b/sw/qa/extras/rtfimport/rtfimport.cxx
index f8c8a2f..d2ccfba 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -134,6 +134,7 @@ public:
void testFdo61193();
void testFdo63023();
void testFdo42109();
+void testFdo62977();
CPPUNIT_TEST_SUITE(Test);
#if !defined(MACOSX) !defined(WNT)
@@ -257,6 +258,7 @@ void Test::run()
{hello.rtf, Test::testFdo61193},
{fdo63023.rtf, Test::testFdo63023},
{fdo42109.rtf, Test::testFdo42109},
+{fdo62977.rtf, Test::testFdo62977},
};
header();
for (unsigned int i = 0; i SAL_N_ELEMENTS(aMethods); ++i)
@@ -1224,6 +1226,12 @@ void Test::testFdo42109()
CPPUNIT_ASSERT_EQUAL(OUString(TextField),
getPropertyOUString(getRun(getParagraphOfText(1, xCell-getText()), 1),
TextPortionType));
}
+void Test::testFdo62977()
+{
+// The middle character was imported as '?' instead of the proper unicode
value.
+getRun(getParagraph(1), 1,
OUString(\xE5\xB9\xB4\xEF\xBC\x94\xE6\x9C\x88, 9, RTL_TEXTENCODING_UTF8));
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(Test);
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 361ab17..9943d74 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -3061,7 +3061,10 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword,
int nParam)
m_aStates.top().nUc = nParam;
break;
case RTF_U:
-if ((SAL_MIN_INT16 = nParam) (nParam = SAL_MAX_INT16))
+// sal_Unicode is unsigned 16-bit, RTF may represent that as a
+// signed SAL_MIN_INT16..SAL_MAX_INT16 or 0..SAL_MAX_UINT16. The
+// static_cast() will do the right thing.
+if ((SAL_MIN_INT16 = nParam) (nParam = SAL_MAX_UINT16))
{
m_aUnicodeBuffer.append(static_castsal_Unicode(nParam));
m_aStates.top().nCharsToSkip = m_aStates.top().nUc;
___
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' - 3 commits - 3b/252796e1126b5ec1216082f55b8d12017eaeb1 9d/54c0355f37ced80fed1b24f238d4c8751a2345 a7/d457da0e9d7d2ede3906d346869322801b9707
3b/252796e1126b5ec1216082f55b8d12017eaeb1 |1 + 9d/54c0355f37ced80fed1b24f238d4c8751a2345 |1 + a7/d457da0e9d7d2ede3906d346869322801b9707 |1 + 3 files changed, 3 insertions(+) New commits: commit f538411fe7f126da7f2db6e2c4265253a88c470c Author: Caolán McNamara caol...@redhat.com Date: Wed May 15 09:37:25 2013 +0100 Notes added by 'git notes add' diff --git a/3b/252796e1126b5ec1216082f55b8d12017eaeb1 b/3b/252796e1126b5ec1216082f55b8d12017eaeb1 new file mode 100644 index 000..fb381ea --- /dev/null +++ b/3b/252796e1126b5ec1216082f55b8d12017eaeb1 @@ -0,0 +1 @@ +merged as: fe19401efc86522d8876130129ef46ec6cf7cb74 commit 46cc77a0653af2a4059ce26a8d1fdca546f52742 Author: Caolán McNamara caol...@redhat.com Date: Wed May 15 09:37:19 2013 +0100 Notes added by 'git notes add' diff --git a/a7/d457da0e9d7d2ede3906d346869322801b9707 b/a7/d457da0e9d7d2ede3906d346869322801b9707 new file mode 100644 index 000..fb381ea --- /dev/null +++ b/a7/d457da0e9d7d2ede3906d346869322801b9707 @@ -0,0 +1 @@ +merged as: fe19401efc86522d8876130129ef46ec6cf7cb74 commit 8cd4924d3556a8961e03c337e8d3e200d9a8d61f Author: Caolán McNamara caol...@redhat.com Date: Wed May 15 09:37:12 2013 +0100 Notes added by 'git notes add' diff --git a/9d/54c0355f37ced80fed1b24f238d4c8751a2345 b/9d/54c0355f37ced80fed1b24f238d4c8751a2345 new file mode 100644 index 000..fb381ea --- /dev/null +++ b/9d/54c0355f37ced80fed1b24f238d4c8751a2345 @@ -0,0 +1 @@ +merged as: fe19401efc86522d8876130129ef46ec6cf7cb74 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/gengal' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Branch 'feature/v2' - tb/tb_phases.sh
tb/tb_phases.sh |8 +---
1 file changed, 5 insertions(+), 3 deletions(-)
New commits:
commit a5d537a402dfdd3b598c060ddfc5da40f51545a6
Author: Norbert Thiebaud nthieb...@gmail.com
Date: Wed May 15 03:40:48 2013 -0500
tb: problem with make interferring with bash traps
diff --git a/tb/tb_phases.sh b/tb/tb_phases.sh
index aeb4181..00b9fd0 100644
--- a/tb/tb_phases.sh
+++ b/tb/tb_phases.sh
@@ -88,7 +88,9 @@ local extra_buildid=
fi
if [ ${R} = 0 ] ; then
export EXTRA_BUILDID=$extra_buildid
-if ! ${TB_NICE} ${TB_WATCHDOG} ${MAKE?} -sr tb_${P?}_build.log
21 ; then
+# we for MAKE_RESTARTS=1 because 1/ we know thta Makefile is up to date
+# and 2/ the 'restart' mechanism in make is messed-up by the fact that
we trap SIGINT
+if ! ${TB_NICE} ${TB_WATCHDOG} ${MAKE?} MAKE_RESTARTS=1 -sr
tb_${P?}_build.log 21 ; then
tb_REPORT_LOG=tb_${P?}_build.log
tb_REPORT_MSGS=build failed - error is:
[ $V ] echo make failed :
@@ -97,7 +99,7 @@ local extra_buildid=
else
# if we want to populate bibisect we need to 'install'
if [ ${TB_TYPE?} = tb -a ${TB_BIBISECT} != 0 ] ; then
-if ! ${TB_NICE} ${TB_WATCHDOG} ${MAKE?} -sr install-tb
tb_${P?}_build.log 21 ; then
+if ! ${TB_NICE} ${TB_WATCHDOG} ${MAKE?} MAKE_RESTARTS=1 -sr
install-tb tb_${P?}_build.log 21 ; then
tb_REPORT_LOG=tb_${P}_build.log
tb_REPORT_MSGS=build failed - error is:
R=1
@@ -144,7 +146,7 @@ canonical_do_test()
{
if [ ${R} = 0 ] ; then
if [ ${TB_DO_TESTS} = 1 ] ; then
-if ! ${TB_NICE} ${TB_WATCHDOG} ${MAKE?} -sr check
tb_${P?}_tests.log 21 ; then
+if ! ${TB_NICE} ${TB_WATCHDOG} ${MAKE?} MAKE_RESTARTS=1 -sr check
tb_${P?}_tests.log 21 ; then
tb_REPORT_LOG=tb_${P?}_tests.log
tb_REPORT_MSGS=check failed - error is:
R=1
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - writerfilter/source
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 13 ++---
1 file changed, 6 insertions(+), 7 deletions(-)
New commits:
commit df73fa5feb10df10c4ba036be5fac1ddb9b6915f
Author: Cédric Bosdonnat cedric.bosdon...@free.fr
Date: Tue May 14 14:59:31 2013 +0200
fdo#64249: make sure we have matching start/end level for table in shapes
Change-Id: I4928f6a54e6cca9b26c0d2391fc1545688be2375
(cherry picked from commit 9ceda3013a6b7e60e0e56ba540e217fd36a34a0f)
Reviewed-on: https://gerrit.libreoffice.org/3907
Reviewed-by: Miklos Vajna vmik...@suse.cz
Tested-by: Miklos Vajna vmik...@suse.cz
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index deda4f1..48e40dea 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -1627,6 +1627,10 @@ void DomainMapper_Impl::PushShapeContext( const
uno::Reference drawing::XShape
if (m_aTextAppendStack.empty())
return;
uno::Referencetext::XTextAppend xTextAppend =
m_aTextAppendStack.top().xTextAppend;
+
+appendTableManager( );
+appendTableHandler( );
+getTableManager().startLevel();
try
{
uno::Reference lang::XServiceInfo xSInfo( xShape,
uno::UNO_QUERY_THROW );
@@ -1685,10 +1689,6 @@ void DomainMapper_Impl::PushShapeContext( const
uno::Reference drawing::XShape
xProps-setPropertyValue( rPropNameSupplier.GetName(
PROP_ANCHOR_TYPE ), bIsGraphic ? uno::makeAny(
text::TextContentAnchorType_AS_CHARACTER ) : uno::makeAny(
text::TextContentAnchorType_AT_PARAGRAPH ) );
}
}
-
-appendTableManager( );
-appendTableHandler( );
-getTableManager().startLevel();
}
catch ( const uno::Exception e )
{
@@ -1700,11 +1700,10 @@ void DomainMapper_Impl::PushShapeContext( const
uno::Reference drawing::XShape
void DomainMapper_Impl::PopShapeContext()
{
+getTableManager().endLevel();
+popTableManager();
if ( m_aAnchoredStack.size() 0 )
{
-getTableManager().endLevel();
-popTableManager();
-
// For OLE object replacement shape, the text append context was
already removed
// or the OLE object couldn't be inserted.
if ( !m_aAnchoredStack.top().bToRemove )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED libreoffice-4-0] fdo#64249: make sure we have matching start/end level for ta...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3907 Approvals: Miklos Vajna: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3907 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4928f6a54e6cca9b26c0d2391fc1545688be2375 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Bosdonnat Cedric cedric.bosdon...@free.fr Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz ___ 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/docshell/impex.cxx | 13 -
1 file changed, 13 deletions(-)
New commits:
commit 09ff02c499579c1dd9eed500121875e586ea8716
Author: Eike Rathke er...@redhat.com
Date: Tue May 14 13:39:27 2013 +0200
resolved fdo#60468 no special tab case workaround for CSV import
This reverts 322cbc3818b0553254aab2dfb3c5b196fe814097 Import mal-formed
csv files gracefully. (code now moved to a different location) which
was a workaround for a specific situation that breaks things with other
documents.
With the rework of CSV import for 3.6 the import of the one failing
document https://bugzilla.novell.com/attachment.cgi?id=294589 from
https://bugzilla.novell.com/show_bug.cgi?id=507322 works almost fine
without this workaround, with one difference in row 1805 where data is
completely broken and parts of two rows end up in one cell P1805. That
row wasn't correct with the workaround either, see also cell P1805 in
earlier versions.
As a result now without that workaround there is one data row less for
the broken document but correct data for correct documents.
Change-Id: Iacf56993619cd92c1df81f0c49de0eeb04c2e4e4
(cherry picked from commit a883783c2a1b0e7a8ee5b46387d1e1e3bc5e19bd)
Reviewed-on: https://gerrit.libreoffice.org/3905
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx
index 9734f72..eab9baf 100644
--- a/sc/source/ui/docshell/impex.cxx
+++ b/sc/source/ui/docshell/impex.cxx
@@ -2304,9 +2304,6 @@ rtl::OUString ReadCsvLine( SvStream rStream, bool
bEmbeddedLineBreak,
{
const sal_Unicode* pSeps = rFieldSeparators.GetBuffer();
-// See if the separator(s) include tab.
-bool bTabSep = lcl_UnicodeStrChr(pSeps, '\t') != NULL;
-
QuoteType eQuoteState = FIELDEND_QUOTE;
bool bFieldStart = true;
@@ -2321,16 +2318,6 @@ rtl::OUString ReadCsvLine( SvStream rStream, bool
bEmbeddedLineBreak,
{
if (nQuotes)
{
-if (bTabSep *p == '\t' (nQuotes % 2) != 0)
-{
-// When tab-delimited, tab char ends quoted sequence
-// even if we haven't reached the end quote. Doing
-// this helps keep mal-formed rows from damaging
-// other, well-formed rows.
-nQuotes = 0;
-break;
-}
-
if (*p == cFieldQuote)
{
if (bFieldStart)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-3-6' - sc/source
sc/source/ui/docshell/impex.cxx | 13 -
1 file changed, 13 deletions(-)
New commits:
commit b2b6753df528d62c7f0a2be902c822a029512523
Author: Eike Rathke er...@redhat.com
Date: Tue May 14 13:39:27 2013 +0200
resolved fdo#60468 no special tab case workaround for CSV import
This reverts 322cbc3818b0553254aab2dfb3c5b196fe814097 Import mal-formed
csv files gracefully. (code now moved to a different location) which
was a workaround for a specific situation that breaks things with other
documents.
With the rework of CSV import for 3.6 the import of the one failing
document https://bugzilla.novell.com/attachment.cgi?id=294589 from
https://bugzilla.novell.com/show_bug.cgi?id=507322 works almost fine
without this workaround, with one difference in row 1805 where data is
completely broken and parts of two rows end up in one cell P1805. That
row wasn't correct with the workaround either, see also cell P1805 in
earlier versions.
As a result now without that workaround there is one data row less for
the broken document but correct data for correct documents.
Change-Id: Iacf56993619cd92c1df81f0c49de0eeb04c2e4e4
(cherry picked from commit a883783c2a1b0e7a8ee5b46387d1e1e3bc5e19bd)
Reviewed-on: https://gerrit.libreoffice.org/3906
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx
index 2957661..f6526a4 100644
--- a/sc/source/ui/docshell/impex.cxx
+++ b/sc/source/ui/docshell/impex.cxx
@@ -2327,9 +2327,6 @@ rtl::OUString ReadCsvLine( SvStream rStream, bool
bEmbeddedLineBreak,
{
const sal_Unicode* pSeps = rFieldSeparators.GetBuffer();
-// See if the separator(s) include tab.
-bool bTabSep = lcl_UnicodeStrChr(pSeps, '\t') != NULL;
-
QuoteType eQuoteState = FIELDEND_QUOTE;
bool bFieldStart = true;
@@ -2344,16 +2341,6 @@ rtl::OUString ReadCsvLine( SvStream rStream, bool
bEmbeddedLineBreak,
{
if (nQuotes)
{
-if (bTabSep *p == '\t' (nQuotes % 2) != 0)
-{
-// When tab-delimited, tab char ends quoted sequence
-// even if we haven't reached the end quote. Doing
-// this helps keep mal-formed rows from damaging
-// other, well-formed rows.
-nQuotes = 0;
-break;
-}
-
if (*p == cFieldQuote)
{
if (bFieldStart)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: libwps/ExternalProject_libwps.mk
libwps/ExternalProject_libwps.mk |1 + 1 file changed, 1 insertion(+) New commits: commit 9c2a1cb4351c8f80a27b7ba413ad382368387425 Author: Tor Lillqvist tlillqv...@suse.com Date: Wed May 15 11:43:04 2013 +0300 Fix MSVC build Change-Id: Ie0dae388769f9119f0d836abd87205eff17a03f1 diff --git a/libwps/ExternalProject_libwps.mk b/libwps/ExternalProject_libwps.mk index ba1bdb0..7b586c0 100644 --- a/libwps/ExternalProject_libwps.mk +++ b/libwps/ExternalProject_libwps.mk @@ -32,6 +32,7 @@ $(call gb_ExternalProject_get_state_target,libwps,build) : --disable-werror \ CXXFLAGS=$(if $(filter NO,$(SYSTEM_BOOST)),-I$(call gb_UnpackedTarball_get_dir,boost),$(BOOST_CPPFLAGS)) \ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ + $(if $(filter MSC,$(COM)),AR=lib.exe SED=sed.exe) \ (cd $(EXTERNAL_WORKDIR)/src/lib $(MAKE)) \ ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - svx/source
svx/source/form/fmtextcontrolshell.cxx |5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) New commits: commit 66ca50016b8a65e67269026ca5b456fa4f8fa35e Author: Lionel Elie Mamane lio...@mamane.lu Date: Sun May 12 00:35:31 2013 +0200 fdo#63695 revert hackish fix to i#51621 Change-Id: I688a659207c4b95cc98ff5dc5c5622d4592b3f89 (cherry picked from commit 7fd1cc18130464a9f09cb7a866e88c4d52e4716d) Reviewed-on: https://gerrit.libreoffice.org/3864 Reviewed-by: Miklos Vajna vmik...@suse.cz Tested-by: Miklos Vajna vmik...@suse.cz diff --git a/svx/source/form/fmtextcontrolshell.cxx b/svx/source/form/fmtextcontrolshell.cxx index a4551af..47e5e7d 100644 --- a/svx/source/form/fmtextcontrolshell.cxx +++ b/svx/source/form/fmtextcontrolshell.cxx @@ -1271,8 +1271,9 @@ namespace svx // shells too much (In theory, nearly every slot could have an own shell then). // // #i51621# / 2005-08-19 / frank.schoenh...@sun.com -bool bHaveAnyServeableSlots = m_xActiveTextComponent.is() || !m_aControlFeatures.empty(); -if ( m_aControlActivationHandler.IsSet() bHaveAnyServeableSlots ) +// bool bHaveAnyServeableSlots = m_xActiveTextComponent.is() || !m_aControlFeatures.empty(); +// LEM: not calling m_aControlActivatonHandler causes fdo#63695, so disable this hack for now. +if ( m_aControlActivationHandler.IsSet() /* bHaveAnyServeableSlots */ ) m_aControlActivationHandler.Call( NULL ); m_bNeedClipboardInvalidation = true; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED libreoffice-3-6] resolved fdo#60468 no special tab case workaround for CSV im...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3906 Approvals: Fridrich Strba: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3906 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iacf56993619cd92c1df81f0c49de0eeb04c2e4e4 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Eike Rathke er...@redhat.com Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED libreoffice-4-0] resolved fdo#60468 no special tab case workaround for CSV im...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3905 Approvals: Fridrich Strba: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3905 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iacf56993619cd92c1df81f0c49de0eeb04c2e4e4 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Eike Rathke er...@redhat.com Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED libreoffice-4-0] fdo#63695 revert hackish fix to i#51621
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3864 Approvals: Miklos Vajna: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3864 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I688a659207c4b95cc98ff5dc5c5622d4592b3f89 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Lionel Elie Mamane lio...@mamane.lu Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - forms/source sal/inc
forms/source/runtime/formoperations.cxx | 173 +---
sal/inc/sal/log-areas.dox |4
2 files changed, 141 insertions(+), 36 deletions(-)
New commits:
commit 4582d74fc3c55f05b77f64efc6c5500496439df0
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Sun May 12 04:06:32 2013 +0200
commit subforms before moving in parent form
else, all pending changes in the subforms are lost
(cherry picked from commit 28cacb44009a1d2cb5fdb3b81c1a7c665463d38d)
Conflicts:
forms/source/component/errorbroadcaster.cxx
forms/source/runtime/formoperations.cxx
sal/inc/sal/log-areas.dox
Change-Id: I82b0967729c71a4f01eff9f823a1961fad999679
Reviewed-on: https://gerrit.libreoffice.org/3865
Reviewed-by: Miklos Vajna vmik...@suse.cz
Tested-by: Miklos Vajna vmik...@suse.cz
diff --git a/forms/source/runtime/formoperations.cxx
b/forms/source/runtime/formoperations.cxx
index 6ba363e..1ea05d2 100644
--- a/forms/source/runtime/formoperations.cxx
+++ b/forms/source/runtime/formoperations.cxx
@@ -80,6 +80,7 @@ namespace frm
using ::com::sun::star::sdbc::XRowSet;
using ::com::sun::star::sdbc::XResultSetUpdate;
using ::com::sun::star::form::runtime::XFormController;
+using ::com::sun::star::form::runtime::XFormOperations;
using ::com::sun::star::form::runtime::XFeatureInvalidation;
using ::com::sun::star::form::runtime::FeatureState;
using ::com::sun::star::lang::IllegalArgumentException;
@@ -452,8 +453,128 @@ namespace frm
{
return ( _nFeature != FormFeature::TotalRecords );
}
-}
+template typename TYPE
+TYPE lcl_safeGetPropertyValue_throw( const Reference XPropertySet
_rxProperties, const OUString _rPropertyName, TYPE _Default )
+{
+TYPE value( _Default );
+OSL_PRECOND( _rxProperties.is(), FormOperations::foo: no cursor
(already disposed?)! );
+if ( _rxProperties.is() )
+OSL_VERIFY( _rxProperties-getPropertyValue( _rPropertyName )
= value );
+return value;
+}
+
+// returns false if parent should *abort* (user pressed cancel)
+bool checkConfirmation(bool needConfirmation, bool shouldCommit)
+{
+if(needConfirmation)
+{
+// TODO: shouldn't this be done with an interaction handler?
+QueryBox aQuery( NULL, WB_YES_NO_CANCEL | WB_DEF_YES,
FRM_RES_STRING( RID_STR_QUERY_SAVE_MODIFIED_ROW ) );
+switch ( aQuery.Execute() )
+{
+case RET_NO:
+shouldCommit = false;
+// no break on purpose: don't ask again!
+case RET_YES:
+needConfirmation = false;
+return true;
+case RET_CANCEL:
+return false;
+}
+}
+return true;
+}
+
+bool commit1Form(Reference XFormController xCntrl, bool
needConfirmation, bool shouldCommit)
+{
+Reference XFormOperations xFrmOps(xCntrl-getFormOperations());
+if (!xFrmOps-commitCurrentControl())
+return false;
+
+if(xFrmOps-isModifiedRow())
+{
+if(!checkConfirmation(needConfirmation, shouldCommit))
+return false;
+sal_Bool _;
+if (shouldCommit !xFrmOps-commitCurrentRecord(_))
+return false;
+}
+return true;
+}
+
+bool commitFormAndSubforms(Reference XFormController xCntrl, bool
needConfirmation)
+{
+bool shouldCommit(true);
+assert(xCntrl.is());
+Reference XIndexAccess xSubForms(xCntrl, UNO_QUERY);
+assert(xSubForms.is());
+if(xSubForms.is())
+{
+const sal_Int32 cnt = xSubForms-getCount();
+for(int i=0; i cnt; ++i)
+{
+Reference XFormController
xSubForm(xSubForms-getByIndex(i), UNO_QUERY);
+assert(xSubForm.is());
+if (xSubForm.is())
+{
+if (!commit1Form(xSubForm, needConfirmation,
shouldCommit))
+return false;
+}
+}
+}
+
+if(!commit1Form(xCntrl, needConfirmation, shouldCommit))
+return false;
+
+return true;
+}
+
+bool commit1Form(Reference XForm xFrm, bool needConfirmation, bool
shouldCommit)
+{
+Reference XPropertySet xProps(xFrm, UNO_QUERY_THROW);
+// nothing to do if the record is not modified
+if(!lcl_safeGetPropertyValue_throw( xProps, PROPERTY_ISMODIFIED,
false ))
+return true;
+
+
[Libreoffice-commits] core.git: 2 commits - oovbaapi/ooo sc/qa sc/source
oovbaapi/ooo/vba/excel/XName.idl |8
sc/qa/extras/macros-test.cxx |4
sc/qa/extras/testdocuments/Names.xls |binary
sc/source/ui/vba/vbarange.cxx|2 ++
4 files changed, 10 insertions(+), 4 deletions(-)
New commits:
commit 63899dd0421516da758b7d9a0c276e9cfb4846f5
Author: Noel Power noel.po...@suse.com
Date: Tue May 14 15:59:10 2013 +0100
fire change event after copy ( with dest paramater set )
Change-Id: I86caf96be62120e4bcebadb0083cd4dae1f5d8d1
diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx
index e40aab4..a2470f1 100644
--- a/sc/source/ui/vba/vbarange.cxx
+++ b/sc/source/ui/vba/vbarange.cxx
@@ -2507,6 +2507,8 @@ ScVbaRange::Copy(const ::uno::Any Destination) throw
(uno::RuntimeException)
xRange-getColumn()-1,xRange-getRow()-1), uno::UNO_QUERY_THROW );
uno::Reference sheet::XCellRangeAddressable xSource( mxRange,
uno::UNO_QUERY);
xMover-copyRange( xDestination-getCellAddress(),
xSource-getRangeAddress() );
+if ( ScVbaRange* pRange = getImplementation( xRange ) )
+pRange-fireChangeEvent();
}
else
{
commit fbd74ed44cd011ebab95bb4bc4eb6b15c1272c43
Author: Noel Power noel.po...@suse.com
Date: Tue May 14 12:07:43 2013 +0100
make some vba Name object attributes read/write and add test document
Change-Id: Ibd12835cc5368080a302b3b8d7c6f52ccc434e3c
diff --git a/oovbaapi/ooo/vba/excel/XName.idl b/oovbaapi/ooo/vba/excel/XName.idl
index dc6ba1c..d46dc14 100644
--- a/oovbaapi/ooo/vba/excel/XName.idl
+++ b/oovbaapi/ooo/vba/excel/XName.idl
@@ -37,10 +37,10 @@ interface XName
[attribute] string NameLocal;
[attribute] boolean Visible;
[attribute] string Value;
-[attribute, readonly] string RefersTo;
-[attribute, readonly] string RefersToLocal;
-[attribute, readonly] string RefersToR1C1;
-[attribute, readonly] string RefersToR1C1Local;
+[attribute] string RefersTo;
+[attribute] string RefersToLocal;
+[attribute] string RefersToR1C1;
+[attribute] string RefersToR1C1Local;
[attribute, readonly] XRange RefersToRange;
void Delete( );
diff --git a/sc/qa/extras/macros-test.cxx b/sc/qa/extras/macros-test.cxx
index 347db65..68bed14 100644
--- a/sc/qa/extras/macros-test.cxx
+++ b/sc/qa/extras/macros-test.cxx
@@ -179,6 +179,10 @@ void ScMacrosTest::testVba()
OUString(Workbooks.),
OUString(vnd.sun.Star.script:VBAProject.testMacros.test?language=Basiclocation=document)
},
+{
+OUString(Names.),
+
OUString(vnd.sun.Star.script:VBAProject.testMacros.test?language=Basiclocation=document)
+},
};
OUString sTempDir;
OUString sTempDirURL;
diff --git a/sc/qa/extras/testdocuments/Names.xls
b/sc/qa/extras/testdocuments/Names.xls
new file mode 100755
index 000..fcacf9b
Binary files /dev/null and b/sc/qa/extras/testdocuments/Names.xls differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: libwpg/ExternalProject_libwpg.mk
libwpg/ExternalProject_libwpg.mk |1 + 1 file changed, 1 insertion(+) New commits: commit 050a51b69e89e230e157be52d8b23862f3c06ba8 Author: Tor Lillqvist tlillqv...@suse.com Date: Wed May 15 11:48:43 2013 +0300 Fix MSVC build Have to pass AR=lib.exe and SED=sed.exe on the configure command line, otherwise for some reason it doesn't know what archiver to use, and thinks it can't find a sed that does not truncate output. Change-Id: I1ce29e62b6ecf6a2fc8fc89cdde2c7bb985a diff --git a/libwpg/ExternalProject_libwpg.mk b/libwpg/ExternalProject_libwpg.mk index 226474c..5c858cb 100644 --- a/libwpg/ExternalProject_libwpg.mk +++ b/libwpg/ExternalProject_libwpg.mk @@ -30,6 +30,7 @@ $(call gb_ExternalProject_get_state_target,libwpg,build) : --disable-debug \ --disable-werror \ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ + $(if $(filter MSC,$(COM)),AR=lib.exe SED=sed.exe) \ (cd $(EXTERNAL_WORKDIR)/src/lib $(MAKE)) \ ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED libreoffice-4-0] commit subforms before moving in parent form
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3865 Approvals: Miklos Vajna: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3865 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I82b0967729c71a4f01eff9f823a1961fad999679 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Lionel Elie Mamane lio...@mamane.lu Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Euro Converter Wizard
I'm for the removal, too. Thomas On 14.05.2013 12:54, Xisco Faulí wrote: Hello all, Euro Converter Wizard has become a bit outdated nowadays and I'm wondering if it'd convenient to get rid of it. Personally I'd do so, but I'd like to hear from you, especially from the libreoffice expect to decide together what's the best. So please, I'd appreciate if you could share your thoughts about it. Regards ___ 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: Branch 'feature/sidebar' - include/sfx2
include/sfx2/sidebar/SidebarToolBox.hxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a3824cb211348a4569052f7f54181d7128db4d3f Author: Caolán McNamara caol...@redhat.com Date: Wed May 15 09:58:16 2013 +0100 setPosSizePixel-SetPosSizePixel Change-Id: I07002afa93dbf1e3b0a9829970c548abff81d55b diff --git a/include/sfx2/sidebar/SidebarToolBox.hxx b/include/sfx2/sidebar/SidebarToolBox.hxx index 37717ad..6bc9a34 100644 --- a/include/sfx2/sidebar/SidebarToolBox.hxx +++ b/include/sfx2/sidebar/SidebarToolBox.hxx @@ -54,7 +54,7 @@ public: virtual void Paint (const Rectangle rRect); virtual Point GetPosPixel (void) const; -virtual void SetPosSizePixel ( +virtual void setPosSizePixel ( long nX, long nY, long nWidth, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
developing MirrorBrain
Hello, sorry for crossposting to both lists, but as the FDO one has lots of developers on it, and I wanted to raise their attention - without distracting them from important LibreOffice work, of course. ;-) Many of you may know that we rely on MirrorBrain for providing our downloads. It has proven to be very stable and reliable, but there are several improvements we have incorporated already - many of them purerly documentation related (better setup on our systems), but right now, we also face some issues with the packaging, that needs to be improved to run on recent platforms. Plus, we have some wishlist items, like live download statistics, which we want to implement. In a nutshell, I think it makes sense to get a bit deeper involved in MirrorBrain development. We are a large adopter of it, and if we improve it for our use, it makes sense to share that with the general public. Maybe we can join forces with other projects using it as well. I have started a discussion on the MirrorBrain list on that at http://mirrorbrain.org/archive/mirrorbrain/0187.html and would like to follow-up on our website list with details on how to coordinate that TDF-wise. If anyone wants to contribute, feel free to join, of course! Florian ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: libmwaw/ExternalProject_libmwaw.mk
libmwaw/ExternalProject_libmwaw.mk |1 + 1 file changed, 1 insertion(+) New commits: commit 4e312f0c90247ccaa138520aa9e080453ec90b64 Author: Tor Lillqvist tlillqv...@suse.com Date: Wed May 15 12:00:29 2013 +0300 Say hello to automake 1.13 here, too Change-Id: I1d0fd352cb0b500c64f86197b2510450b0f7d4ce diff --git a/libmwaw/ExternalProject_libmwaw.mk b/libmwaw/ExternalProject_libmwaw.mk index 82b4a3d..3a0a8f0 100644 --- a/libmwaw/ExternalProject_libmwaw.mk +++ b/libmwaw/ExternalProject_libmwaw.mk @@ -32,6 +32,7 @@ $(call gb_ExternalProject_get_state_target,libmwaw,build) : --disable-werror \ CXXFLAGS=$(if $(filter NO,$(SYSTEM_BOOST)),-I$(call gb_UnpackedTarball_get_dir,boost),$(BOOST_CPPFLAGS)) \ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ + $(if $(filter MSC,$(COM)),AR=lib.exe SED=sed.exe) \ (cd $(EXTERNAL_WORKDIR)/src/lib $(MAKE)) \ ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: config_host.mk.in solenv/bin
config_host.mk.in |1
solenv/bin/modules/installer/scriptitems.pm | 68
solenv/bin/ooinstall|4 -
3 files changed, 2 insertions(+), 71 deletions(-)
New commits:
commit 44727e34a1e4eb03b01c6be77a753a18ae84aed7
Author: David Tardon dtar...@redhat.com
Date: Tue May 14 16:07:54 2013 +0200
drop now unused DEFAULT_TO_ENGLISH_FOR_PACKING
See
http://lists.freedesktop.org/archives/libreoffice/2013-May/051706.html
for explanation.
Change-Id: Ieb7480f9f7a64a026abc985edde3ed932c1e8f56
Reviewed-on: https://gerrit.libreoffice.org/3908
Tested-by: LibreOffice gerrit bot ger...@libreoffice.org
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/config_host.mk.in b/config_host.mk.in
index 7515883..2c5167d 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -83,7 +83,6 @@ export DBUSMENUGTK_LIBS=$(gb_SPACE)@DBUSMENUGTK_LIBS@
export DBUS_CFLAGS=$(gb_SPACE)@DBUS_CFLAGS@
export DBUS_LIBS=$(gb_SPACE)@DBUS_LIBS@
export DEFAULT_BRAND_IMAGES=@DEFAULT_BRAND_IMAGES@
-export DEFAULT_TO_ENGLISH_FOR_PACKING=yes
export DEVINSTALLDIR=@DEVINSTALLDIR@
export DIAGRAM_EXTENSION_PACK=@DIAGRAM_EXTENSION_PACK@
export DICT_SYSTEM_DIR=@DICT_SYSTEM_DIR@
diff --git a/solenv/bin/modules/installer/scriptitems.pm
b/solenv/bin/modules/installer/scriptitems.pm
index cd4b141..3406e2f 100644
--- a/solenv/bin/modules/installer/scriptitems.pm
+++ b/solenv/bin/modules/installer/scriptitems.pm
@@ -926,15 +926,7 @@ sub get_sourcepath_from_filename_and_includepath_classic
$onefile = ; # the sourcepath has to be empty
if ( $write_logfile)
{
-if ( $ENV{'DEFAULT_TO_ENGLISH_FOR_PACKING'} )
-{
-$infoline = WARNING: Source for $$searchfilenameref not
found!\n; # Important message in log file
-}
-else
-{
-$infoline = ERROR: Source for $$searchfilenameref not
found!\n;# Important message in log file
-}
-
+$infoline = ERROR: Source for $$searchfilenameref not found!\n;
# Important message in log file
push( @installer::globals::logfileinfo, $infoline);
}
}
@@ -1002,15 +994,7 @@ sub get_sourcepath_from_filename_and_includepath
$onefile = ; # the sourcepath has to be empty
if ( $write_logfile)
{
-if ( $ENV{'DEFAULT_TO_ENGLISH_FOR_PACKING'} )
-{
-$infoline = WARNING: Source for $$searchfilenameref not
found!\n; # Important message in log file
-}
-else
-{
-$infoline = ERROR: Source for $$searchfilenameref not
found!\n;# Important message in log file
-}
-
+$infoline = ERROR: Source for $$searchfilenameref not found!\n;
# Important message in log file
push( @installer::globals::logfileinfo, $infoline);
}
}
@@ -1097,54 +1081,6 @@ sub get_Source_Directory_For_Files_From_Includepathlist
else { $sourcepathref =
get_sourcepath_from_filename_and_includepath(\$onefilename,
$includepatharrayref, 1); }
$onefile-{'sourcepath'} = $$sourcepathref; # This $$sourcepathref is
empty, if no source was found
-
-# defaulting to english for multilingual files if
DEFAULT_TO_ENGLISH_FOR_PACKING is set
-
-if ( $ENV{'DEFAULT_TO_ENGLISH_FOR_PACKING'} )
-{
-if (( ! $onefile-{'sourcepath'} ) (
$onefile-{'ismultilingual'} ))
-{
-my $oldname = $onefile-{'Name'};
-my $oldlanguage = $onefile-{'specificlanguage'};
-my $newlanguage = en-US;
-$onefilename = $onefile-{'Name'};
-$onefilename =~ s/$oldlanguage\./$newlanguage\./; # Example:
tplwizfax_it.zip - tplwizfax_en-US.zip
-$onefilename =~ s/^\s*\Q$installer::globals::separator\E//;
# filename begins with a slash, for instance
/registry/schema/org/openoffice/VCL.xcs
-$sourcepathref =
get_sourcepath_from_filename_and_includepath(\$onefilename,
$includepatharrayref, 1);
-$onefile-{'sourcepath'} = $$sourcepathref;
# This $$sourcepathref is empty, if no source was found
-
-if ($onefile-{'sourcepath'}) # defaulting to english was
successful
-{
-$infoline = WARNING: Using $onefilename instead of
$oldname\n;
-push( @installer::globals::logfileinfo, $infoline);
-print $infoline;
-
-# If the directory, in which the new file is installed, is
not language dependent,
-# the filename has to be changed to avoid installation
conflicts
-# No mechanism for resource files!
-# -
[PATCH libreoffice-4-0] fdo#62977 allow SAL_MAX_INT16..SAL_MAX_UINT16 when importing...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3913
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/13/3913/1
fdo#62977 allow SAL_MAX_INT16..SAL_MAX_UINT16 when importing RTF_U
(cherry picked from commit 4a816a816e8b4e213394898bd0e307dd90fcbb64)
Conflicts:
sw/qa/extras/rtfimport/rtfimport.cxx
Change-Id: Ie36d5881b0ebe8c38526690ca27d02bfb7af7829
---
A sw/qa/extras/rtfimport/data/fdo62977.rtf
M sw/qa/extras/rtfimport/rtfimport.cxx
M writerfilter/source/rtftok/rtfdocumentimpl.cxx
3 files changed, 36 insertions(+), 1 deletion(-)
diff --git a/sw/qa/extras/rtfimport/data/fdo62977.rtf
b/sw/qa/extras/rtfimport/data/fdo62977.rtf
new file mode 100644
index 000..f16135d
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/fdo62977.rtf
@@ -0,0 +1,24 @@
+{\rtf1 \ansi
+{\fonttbl;
+{
+\f0 \'41\'72\'69\'61\'6c;}
+{
+\f1 \'53\'79\'6d\'62\'6f\'6c;}
+{
+\f2 \'54\'69\'6d\'65\'73\'20\'4e\'65\'77\'20\'52\'6f\'6d\'61\'6e;}
+{
+\f3 \'82\'6c\'82\'72\'20\'96\'be\'92\'a9;}
+}
+{\*\generator Apache XML Graphics RTF Library;}
+\fet0 \ftnbj \paperw11905 \paperh16837 \margt1984 \margb1700 \margl1700
\margr1700 \itap0 \sectd \headery720 \footery720 \stextflow0 \cols1
+{\ri0 \li0
+{\qr \b0 \fi0 \cf1 \loch\af3 \hich\af3 \dbch\f3 \ri0 \sl420 \i0 \li0 \fs21
+{\b0 \cf1 \loch\af3 \hich\af3 \dbch\f3 \i0 \fs21
+{\strike0 \b0 \cf1 \loch\af3 \hich\af3 \dbch\f3 \ul0 \i0 \fs21 \sa0 \sb0
+\u24180\'3f\u65300\'3f\u26376\'3f
+\par
+}
+}
+}
+}
+}
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx
b/sw/qa/extras/rtfimport/rtfimport.cxx
index c02dac5..bbac478 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -147,6 +147,7 @@
void testFdo51916();
void testFdo61193();
void testFdo63023();
+void testFdo62977();
CPPUNIT_TEST_SUITE(Test);
#if !defined(MACOSX) !defined(WNT)
@@ -264,6 +265,7 @@
{fdo51916.rtf, Test::testFdo51916},
{hello.rtf, Test::testFdo61193},
{fdo63023.rtf, Test::testFdo63023},
+{fdo62977.rtf, Test::testFdo62977},
};
for (unsigned int i = 0; i SAL_N_ELEMENTS(aMethods); ++i)
{
@@ -1214,6 +1216,12 @@
CPPUNIT_ASSERT_EQUAL(sal_Int32(0x99),
getPropertysal_Int32(getRun(getParagraphOfText(1, xHeaderText), 1),
CharBackColor));
}
+void Test::testFdo62977()
+{
+// The middle character was imported as '?' instead of the proper unicode
value.
+getRun(getParagraph(1), 1,
OUString(\xE5\xB9\xB4\xEF\xBC\x94\xE6\x9C\x88, 9, RTL_TEXTENCODING_UTF8));
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(Test);
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 0a2348d..056ac08 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -2971,7 +2971,10 @@
m_aStates.top().nUc = nParam;
break;
case RTF_U:
-if ((SAL_MIN_INT16 = nParam) (nParam = SAL_MAX_INT16))
+// sal_Unicode is unsigned 16-bit, RTF may represent that as a
+// signed SAL_MIN_INT16..SAL_MAX_INT16 or 0..SAL_MAX_UINT16. The
+// static_cast() will do the right thing.
+if ((SAL_MIN_INT16 = nParam) (nParam = SAL_MAX_UINT16))
{
m_aUnicodeBuffer.append(static_castsal_Unicode(nParam));
m_aStates.top().nCharsToSkip = m_aStates.top().nUc;
--
To view, visit https://gerrit.libreoffice.org/3913
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie36d5881b0ebe8c38526690ca27d02bfb7af7829
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Miklos Vajna vmik...@suse.cz
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] drop now unused DEFAULT_TO_ENGLISH_FOR_PACKING
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3908 Approvals: LibreOffice gerrit bot: Verified Fridrich Strba: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3908 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ieb7480f9f7a64a026abc985edde3ed932c1e8f56 Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: David Tardon dtar...@redhat.com Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/sidebar' - include/sfx2 sfx2/source
include/sfx2/sidebar/SidebarToolBox.hxx |4 ++--
sfx2/source/sidebar/ControllerFactory.cxx |3 +--
sfx2/source/sidebar/SidebarToolBox.cxx| 11 +--
3 files changed, 8 insertions(+), 10 deletions(-)
New commits:
commit b4c7b62d5cb7c499fec6705239b3619d2e3d2ad6
Author: Caolán McNamara caol...@redhat.com
Date: Wed May 15 09:58:16 2013 +0100
various build fixes
Change-Id: I07002afa93dbf1e3b0a9829970c548abff81d55b
diff --git a/include/sfx2/sidebar/SidebarToolBox.hxx
b/include/sfx2/sidebar/SidebarToolBox.hxx
index 6bc9a34..4d5625c 100644
--- a/include/sfx2/sidebar/SidebarToolBox.hxx
+++ b/include/sfx2/sidebar/SidebarToolBox.hxx
@@ -85,8 +85,8 @@ private:
DECL_LINK(ClickHandler, ToolBox*);
DECL_LINK(DoubleClickHandler, ToolBox*);
DECL_LINK(SelectHandler, ToolBox*);
-DECL_LINK(Activate, ToolBox*);
-DECL_LINK(Deactivate, ToolBox*);
+DECL_LINK(ActivateToolBox, ToolBox*);
+DECL_LINK(DeactivateToolBox, ToolBox*);
void CreateController (
const sal_uInt16 nItemId,
diff --git a/sfx2/source/sidebar/ControllerFactory.cxx
b/sfx2/source/sidebar/ControllerFactory.cxx
index e7463a8..7ce9eb8 100644
--- a/sfx2/source/sidebar/ControllerFactory.cxx
+++ b/sfx2/source/sidebar/ControllerFactory.cxx
@@ -15,7 +15,6 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include precompiled_sfx2.hxx
#include sfx2/sidebar/ControllerFactory.hxx
#include sfx2/sidebar/CommandInfoProvider.hxx
@@ -53,7 +52,7 @@ Referenceframe::XToolbarController
ControllerFactory::CreateToolBoxController(
if ( ! xController.is())
xController.set(
static_castXWeak*(new svt::GenericToolboxController(
-::comphelper::getProcessServiceFactory(),
+::comphelper::getProcessComponentContext(),
rxFrame,
pToolBox,
nItemId,
diff --git a/sfx2/source/sidebar/SidebarToolBox.cxx
b/sfx2/source/sidebar/SidebarToolBox.cxx
index ea4f910..61110ee 100644
--- a/sfx2/source/sidebar/SidebarToolBox.cxx
+++ b/sfx2/source/sidebar/SidebarToolBox.cxx
@@ -60,8 +60,8 @@ SidebarToolBox::SidebarToolBox (
SetClickHdl(LINK(this, SidebarToolBox, ClickHandler));
SetDoubleClickHdl(LINK(this, SidebarToolBox, DoubleClickHandler));
SetSelectHdl(LINK(this, SidebarToolBox, SelectHandler));
-SetActivateHdl(LINK(this, SidebarToolBox, Activate));
-SetDeactivateHdl(LINK(this, SidebarToolBox, Deactivate));
+SetActivateHdl(LINK(this, SidebarToolBox, ActivateToolBox));
+SetDeactivateHdl(LINK(this, SidebarToolBox, DeactivateToolBox));
}
#ifdef DEBUG
@@ -251,14 +251,13 @@ Referenceframe::XToolbarController
SidebarToolBox::GetControllerForItemId (con
void SidebarToolBox::UpdateIcons (const Referenceframe::XFrame rxFrame)
{
const sal_Bool bBigImages (SvtMiscOptions().AreCurrentSymbolsLarge());
-const bool bIsHighContrastActive
(sfx2::sidebar::Theme::IsHighContrastMode());
for (ControllerContainer::iterator iController(maControllers.begin()),
iEnd(maControllers.end());
iController!=iEnd;
++iController)
{
const ::rtl::OUString sCommandURL
(iController-second.msCurrentCommand);
-Image aImage (framework::GetImageFromURL(rxFrame, sCommandURL,
bBigImages, bIsHighContrastActive));
+Image aImage (framework::GetImageFromURL(rxFrame, sCommandURL,
bBigImages));
SetItemImage(iController-first, aImage);
}
}
@@ -349,7 +348,7 @@ IMPL_LINK(SidebarToolBox, SelectHandler, ToolBox*, pToolBox)
-IMPL_LINK(SidebarToolBox, Activate, ToolBox*, EMPTYARG)
+IMPL_LINK(SidebarToolBox, ActivateToolBox, ToolBox*, EMPTYARG)
{
return 1;
}
@@ -357,7 +356,7 @@ IMPL_LINK(SidebarToolBox, Activate, ToolBox*, EMPTYARG)
-IMPL_LINK(SidebarToolBox, Deactivate, ToolBox*, EMPTYARG)
+IMPL_LINK(SidebarToolBox, DeactivateToolBox, ToolBox*, EMPTYARG)
{
return 1;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dev-tools.git: git-hooks/contrib
git-hooks/contrib/buildbot.git/hooks/update | 24 +---
1 file changed, 21 insertions(+), 3 deletions(-)
New commits:
commit c0545eff5f50cb2932c9b34ed00e6aaf09740d67
Author: Miklos Vajna vmik...@suse.cz
Date: Wed May 15 11:06:46 2013 +0200
git-hooks: sync core - buildbot hook
Change-Id: If9481f340fad1263b00b4a467b265fdabeae9c7c
diff --git a/git-hooks/contrib/buildbot.git/hooks/update
b/git-hooks/contrib/buildbot.git/hooks/update
index c935005..ac84fcf 100755
--- a/git-hooks/contrib/buildbot.git/hooks/update
+++ b/git-hooks/contrib/buildbot.git/hooks/update
@@ -14,6 +14,7 @@ if [ $(id -u -n ) != logerrit ] ; then
echo *** The reference for this repo is gerrit. do not push directly
to fdo 2
exit 1
fi
+from=$(git show -s --pretty=format:'%an %ae' $3^{})
project=$(cat $GIT_DIR/description)
recipients=libreoffice-comm...@lists.freedesktop.org
@@ -47,8 +48,9 @@ date_format=%F %R %z
num_path_components=2
# Set subject
+repo=$(basename $(cd $GIT_DIR ; pwd))
if expr $2 : '0*$' /dev/null ; then
- subject=Changes to '${1##refs/heads/}'
+ subject=$repo: Changes to '${1##refs/heads/}'
else
base=$(git-merge-base $2 $3)
subject=$(git-diff-tree -r --name-only $base $3 |
@@ -61,6 +63,7 @@ else
if [ $branch != master ] ; then
subject=Branch '$branch' - $subject
fi
+ subject=$repo: $subject
fi
if expr $2 : '0*$' /dev/null
@@ -109,7 +112,22 @@ else
echo Rebased ref, commits from common ancestor:
;;
esac
- git-rev-list $3 ^$base | while read rev; do git-show $rev; done
+ bytes=0
+ IFS=$(echo)
+ git-rev-list $3 ^$base | while read rev; do git-show -M $rev; done
| sed 's#\\##g' |
+ while read line
+ do
+ if [ $bytes -ge 0 ] ; then
+ bytes=$(( $bytes + ${#line} + 1 ))
+ if [ $bytes -gt 10 ] ; then
+ bytes=-1
+ echo -e \n... etc. - the rest is
truncated
+ else
+ echo $line
+ fi
+ fi
+ done
fi |
-mail -s $subject -a X-Git-Repository:
git://anongit.freedesktop.org/git/ooo-build/ooo-build $recipients
+mail -s $subject -a X-Git-Repository:
git://anongit.freedesktop.org/git/libreoffice/contrib/buildbot.git \
+ -a List-Post: mailto:libreoffice@lists.freedesktop.org -a From:
$from $recipients
exit 0
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: comphelper/source include/comphelper sw/source
comphelper/source/container/embeddedobjectcontainer.cxx | 15 ++---
include/comphelper/embeddedobjectcontainer.hxx |5 +--
sw/source/core/ole/ndole.cxx| 26 +++-
3 files changed, 38 insertions(+), 8 deletions(-)
New commits:
commit 1ba29be90f7141077f2d079d40dffc2efd4f1a2c
Author: Armin Le Grand a...@apache.org
Date: Thu Jun 21 14:25:25 2012 +
Resolves: #i119941# Avoid crash when chart is removed in Writer...
by keeping it's storage and graphic stream.
Patch by: Clarence Guo, zhaoshzh
Review by: alg
Found by: Shan Zhu
(cherry picked from commit 0b71c735dc10202b26972cf91779954b6a96af9a)
Conflicts:
comphelper/inc/comphelper/embeddedobjectcontainer.hxx
comphelper/source/container/embeddedobjectcontainer.cxx
Change-Id: I6ec172644806309d0f06f8522eb8a2adb45899ed
diff --git a/comphelper/source/container/embeddedobjectcontainer.cxx
b/comphelper/source/container/embeddedobjectcontainer.cxx
index 6acf6d8..99bccd0 100644
--- a/comphelper/source/container/embeddedobjectcontainer.cxx
+++ b/comphelper/source/container/embeddedobjectcontainer.cxx
@@ -923,13 +923,15 @@ sal_Bool EmbeddedObjectContainer::MoveEmbeddedObject(
EmbeddedObjectContainer r
return bRet;
}
-sal_Bool EmbeddedObjectContainer::RemoveEmbeddedObject( const OUString rName,
sal_Bool bClose )
+// #i119941, bKeepToTempStorage: use to specify whether store the removed
object to temporary storage+
+sal_Bool EmbeddedObjectContainer::RemoveEmbeddedObject( const OUString rName,
sal_Bool bClose, sal_Bool bKeepToTempStorage )
{
RTL_LOGFILE_CONTEXT( aLog, comphelper (mv76033)
comphelper::EmbeddedObjectContainer::RemoveEmbeddedObject( Name ) );
uno::Reference embed::XEmbeddedObject xObj = GetEmbeddedObject( rName
);
if ( xObj.is() )
-return RemoveEmbeddedObject( xObj, bClose );
+//return RemoveEmbeddedObject( xObj, bClose );
+return RemoveEmbeddedObject( xObj, bClose, bKeepToTempStorage );
else
return sal_False;
}
@@ -987,7 +989,9 @@ sal_Bool EmbeddedObjectContainer::MoveEmbeddedObject( const
OUString rName, Emb
return sal_False;
}
-sal_Bool EmbeddedObjectContainer::RemoveEmbeddedObject( const uno::Reference
embed::XEmbeddedObject xObj, sal_Bool bClose )
+//sal_Bool EmbeddedObjectContainer::RemoveEmbeddedObject( const uno::Reference
embed::XEmbeddedObject xObj, sal_Bool bClose )
+// #i119941, bKeepToTempStorage: use to specify whether store the removed
object to temporary storage+
+sal_Bool EmbeddedObjectContainer::RemoveEmbeddedObject( const uno::Reference
embed::XEmbeddedObject xObj, sal_Bool bClose, sal_Bool bKeepToTempStorage )
{
RTL_LOGFILE_CONTEXT( aLog, comphelper (mv76033)
comphelper::EmbeddedObjectContainer::RemoveEmbeddedObject( Object ) );
@@ -1024,7 +1028,8 @@ sal_Bool EmbeddedObjectContainer::RemoveEmbeddedObject(
const uno::Reference e
// somebody still needs the object, so we must assign a temporary
persistence
try
{
-if ( xPersist.is() )
+//if ( xPersist.is() )
+ if ( xPersist.is() bKeepToTempStorage ) // #i119941
{
/*
//TODO/LATER: needs storage handling! Why not letting the
object do it?!
@@ -1105,7 +1110,7 @@ sal_Bool EmbeddedObjectContainer::RemoveEmbeddedObject(
const uno::Reference e
OSL_ENSURE( bFound, Object not found for removal! );
(void)bFound;
-if ( xPersist.is() )
+if ( xPersist.is() bKeepToTempStorage ) // #i119941#
{
// remove replacement image (if there is one)
RemoveGraphicStream( aName );
diff --git a/include/comphelper/embeddedobjectcontainer.hxx
b/include/comphelper/embeddedobjectcontainer.hxx
index 0347e12..f605066 100644
--- a/include/comphelper/embeddedobjectcontainer.hxx
+++ b/include/comphelper/embeddedobjectcontainer.hxx
@@ -125,8 +125,9 @@ public:
sal_Bool MoveEmbeddedObject( EmbeddedObjectContainer rSrc, const
::com::sun::star::uno::Reference ::com::sun::star::embed::XEmbeddedObject ,
OUString );
// remove an embedded object from the container and from the storage; if
object can't be closed
-sal_BoolRemoveEmbeddedObject( const OUString rName, sal_Bool
bClose=sal_True );
-sal_BoolRemoveEmbeddedObject( const
::com::sun::star::uno::Reference ::com::sun::star::embed::XEmbeddedObject ,
sal_Bool bClose=sal_True );
+// #i119941, bKeepToTempStorage: use to specify whether store the removed
object to temporary storage+
+sal_BoolRemoveEmbeddedObject( const OUString rName, sal_Bool
bClose = sal_True, sal_Bool bKeepToTempStorage = sal_True );
+sal_BoolRemoveEmbeddedObject( const
::com::sun::star::uno::Reference ::com::sun::star::embed::XEmbeddedObject ,
sal_Bool bClose = sal_True, sal_Bool bKeepToTempStorage = sal_True );
// close and
[Libreoffice-commits] core.git: 2 commits - libodfgen/ExternalProject_libodfgen.mk libvisio/ExternalProject_libvisio.mk
libodfgen/ExternalProject_libodfgen.mk |1 + libvisio/ExternalProject_libvisio.mk |1 + 2 files changed, 2 insertions(+) New commits: commit a94dc2203539a1593b99778be16b2c664fd46daa Author: Tor Lillqvist tlillqv...@suse.com Date: Wed May 15 12:12:20 2013 +0300 Also AWK needed here Change-Id: Ifc47c1422f035cb23a9a148510230c8dd2cf42cd diff --git a/libvisio/ExternalProject_libvisio.mk b/libvisio/ExternalProject_libvisio.mk index 3a5ce50..66c6a919 100644 --- a/libvisio/ExternalProject_libvisio.mk +++ b/libvisio/ExternalProject_libvisio.mk @@ -41,6 +41,7 @@ $(call gb_ExternalProject_get_state_target,libvisio,build) : CXXFLAGS=$(if $(filter NO,$(SYSTEM_BOOST)),-I$(call gb_UnpackedTarball_get_dir,boost),$(BOOST_CPPFLAGS)) \ $(if $(filter NO,$(SYSTEM_LIBXML)),-I$(call gb_UnpackedTarball_get_dir,xml2)/include) \ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ + $(if $(filter MSC,$(COM)),AR=lib.exe AWK=awk.exe SED=sed.exe) \ (cd $(EXTERNAL_WORKDIR)/src/lib $(MAKE)) \ ) commit 3baa1c8c9baf6bb35f9d2ff5e002a5403d2d4af4 Author: Tor Lillqvist tlillqv...@suse.com Date: Wed May 15 12:07:16 2013 +0300 I almost sense a pattern, except that AR is not needed here for some reason Change-Id: I260304559eec7b92add33a758623bc039c2e2d3a diff --git a/libodfgen/ExternalProject_libodfgen.mk b/libodfgen/ExternalProject_libodfgen.mk index 3b0ce21..3c9d479 100644 --- a/libodfgen/ExternalProject_libodfgen.mk +++ b/libodfgen/ExternalProject_libodfgen.mk @@ -33,6 +33,7 @@ $(call gb_ExternalProject_get_state_target,libodfgen,build) : --disable-weffc \ CXXFLAGS=$(if $(filter NO,$(SYSTEM_BOOST)),-I$(call gb_UnpackedTarball_get_dir,boost),$(BOOST_CPPFLAGS)) \ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ + $(if $(filter MSC,$(COM)),SED=sed.exe) \ (cd $(EXTERNAL_WORKDIR)/src $(MAKE)) \ ) ___ 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' - 0b/71c735dc10202b26972cf91779954b6a96af9a
0b/71c735dc10202b26972cf91779954b6a96af9a |1 + 1 file changed, 1 insertion(+) New commits: commit 2c5e53dc486296dbdce11dfe441afe71115e75b1 Author: Caolán McNamara caol...@redhat.com Date: Wed May 15 10:13:37 2013 +0100 Notes added by 'git notes add' diff --git a/0b/71c735dc10202b26972cf91779954b6a96af9a b/0b/71c735dc10202b26972cf91779954b6a96af9a new file mode 100644 index 000..1243d45 --- /dev/null +++ b/0b/71c735dc10202b26972cf91779954b6a96af9a @@ -0,0 +1 @@ +merged as: 1ba29be90f7141077f2d079d40dffc2efd4f1a2c ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - include/xmloff xmloff/source
include/xmloff/unointerfacetouniqueidentifiermapper.hxx | 23 --
include/xmloff/xmlmultiimagehelper.hxx |6
xmloff/source/core/unointerfacetouniqueidentifiermapper.cxx | 108 +++-
xmloff/source/core/xmlmultiimagehelper.cxx |8
xmloff/source/draw/ximpshap.cxx | 11 -
xmloff/source/draw/ximpshap.hxx |2
xmloff/source/text/XMLTextFrameContext.cxx |2
xmloff/source/text/XMLTextFrameContext.hxx |2
8 files changed, 55 insertions(+), 107 deletions(-)
New commits:
commit 450cd772aa734cfcb989c8cedd3c0a454db74a34
Author: Thorsten Behrens tbehr...@suse.com
Date: Wed May 15 11:05:45 2013 +0200
Fix fdo#64512 Handle xml:id correctly on multi-image draw:frames
Fixes a regression from the pick-best-image from draw:frame in ODF,
where before sometimes the XShape got deleted that the
UnoInterfaceToUniqueIdentifierMapper::registerReference stored.
For that, added a
UnoInterfaceToUniqueIdentifierMapper::registerReferenceAlways
function, which overwrites potentially existing earlier entries
with the same identifier string.
This fix was originally much more messy, but then dtardon committed
30b248dfe5bfb8a0649e36f22c943b3feb2f1385 which also fixes this here
bug. Now only sneaking in slightly less involved interface map
handling and a safeguard in ximpshap.cxx.
Change-Id: I87501e43518a5fc2fee166c45a4e2f01718f5228
diff --git a/include/xmloff/unointerfacetouniqueidentifiermapper.hxx
b/include/xmloff/unointerfacetouniqueidentifiermapper.hxx
index 6f154bf..6ec3700 100644
--- a/include/xmloff/unointerfacetouniqueidentifiermapper.hxx
+++ b/include/xmloff/unointerfacetouniqueidentifiermapper.hxx
@@ -24,7 +24,6 @@
#include xmloff/dllapi.h
#include sal/types.h
-#include deque
#include map
#include rtl/ustring.hxx
#include com/sun/star/uno/XInterface.hpp
@@ -32,12 +31,10 @@
namespace comphelper
{
-typedef ::std::map OUString, const ::com::sun::star::uno::Reference
::com::sun::star::uno::XInterface IdMap_t;
+typedef ::std::map OUString, ::com::sun::star::uno::Reference
::com::sun::star::uno::XInterface IdMap_t;
class XMLOFF_DLLPUBLIC UnoInterfaceToUniqueIdentifierMapper
{
-typedef std::deque rtl::OUString Reserved_t;
-
public:
UnoInterfaceToUniqueIdentifierMapper();
~UnoInterfaceToUniqueIdentifierMapper();
@@ -54,16 +51,12 @@ public:
*/
bool registerReference( const OUString rIdentifier, const
::com::sun::star::uno::Reference ::com::sun::star::uno::XInterface
rInterface );
-/** reserves an identifier for later registration.
-
-@returns
-false, if the identifier already exists
- */
-bool reserveIdentifier( const rtl::OUString rIdentifier );
+/** always registers the given uno object with the given identifier.
-/** registers the given uno object with reserved identifier.
- */
-bool registerReservedReference( const rtl::OUString rIdentifier, const
com::sun::star::uno::Reference com::sun::star::uno::XInterface rInterface );
+In contrast to registerReference(), this here overwrites any
+earlier registration of the same identifier
+*/
+void registerReferenceAlways( const rtl::OUString rIdentifier, const
::com::sun::star::uno::Reference ::com::sun::star::uno::XInterface
rInterface );
/** @returns
the identifier for the given uno object. If this uno object is not
already
@@ -80,12 +73,10 @@ public:
private:
bool findReference( const ::com::sun::star::uno::Reference
::com::sun::star::uno::XInterface rInterface, IdMap_t::const_iterator rIter
) const;
bool findIdentifier( const OUString rIdentifier, IdMap_t::const_iterator
rIter ) const;
-bool findReserved( const OUString rIdentifier ) const;
-bool findReserved( const OUString rIdentifier,
Reserved_t::const_iterator rIter ) const;
+void insertReference( const OUString rIdentifier, const
::com::sun::star::uno::Reference ::com::sun::star::uno::XInterface
rInterface );
IdMap_tmaEntries;
sal_Int32 mnNextId;
-Reserved_t maReserved;
};
}
diff --git a/xmloff/source/core/unointerfacetouniqueidentifiermapper.cxx
b/xmloff/source/core/unointerfacetouniqueidentifiermapper.cxx
index 568943a..317ad07 100644
--- a/xmloff/source/core/unointerfacetouniqueidentifiermapper.cxx
+++ b/xmloff/source/core/unointerfacetouniqueidentifiermapper.cxx
@@ -17,8 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include algorithm
-
#include xmloff/unointerfacetouniqueidentifiermapper.hxx
using namespace ::com::sun::star;
@@ -72,42 +70,25 @@ bool
UnoInterfaceToUniqueIdentifierMapper::registerReference( const OUString rI
{
return rIdentifier != (*aIter).first;
}
-else if( findIdentifier( rIdentifier, aIter ) ||
RE: hints asked for fdo#59727
Hi Eike,
They are implemented in scaddins/source/datefunc/
I wouldn't have looked for ROT13 there... Is that a location to be maintained
or should it be moved to scaddins/source/analysis?
It seems they are missing from sc/source/filter/oox/formulabase.cxx so
adding them there should solve the store case, and if they are stored
correctly they should also be read correctly. (assuming, I didn't try or
investigate deeper)
The problem probably is that these funcions are not known by Excel, which is
to be verified. If they aren't, then we can (or need to?) store them as the
programmatic name, e.g.
com.sun.star.sheet.addin.datefunctions.getdiffweeks, but need the
mapping to ODFF ORG.OPENOFFICE.WEEKS in
sc/source/filter/oox/formulabase.cxx
As far as I can find out, the problem functions (WEEKS, MONTHS, YEARS,
ISLEAPYEAR, DAYSINMONTH, DAYSINYEAR, WEEKSINYEAR, ROT13) do not exist in Excel.
I don't have Excel, so I can't be certain.
In sc/source/filter/oox/formulabase.cxx I want to add these functions, but I
have some questions about the members of struct FunctionData.
Take e.g. WEEKS:
{ WEEKS, ORG.OPENOFFICE.WEEKS, NOID, NOID, 3, 3,
V, { VR, VR, VR }, FUNCFLAG_EXPORTONLY }
Should mpcOdfFuncName also include ORG.OPENOFFICE.?
Should I use IDs (there not in any BIFF, so I set both to NOID)?
Which flag should I use (i.e. does filter mean: leave out, or does it mean:
process)?
I have not yet given serious attention to the FunctionParamInfo.
If I understand you correctly, WEEKS in an ods should translate to
'org.openoffice.weeks' when saving tp xlsx, which should be translated to WEEKS
when saving to ods. Am I correct?
I intend to fix the xlsx-bug first and then to look at the inconsequent error
messages when no parameters are entered and posisbly to see if I can get the
locale presentation right (i.e. present English function names when set so in
options). And of course do some clean-up if I can.
Winfried
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: include/xmloff xmloff/source
include/xmloff/unointerfacetouniqueidentifiermapper.hxx |1 -
xmloff/source/core/unointerfacetouniqueidentifiermapper.cxx |8
2 files changed, 9 deletions(-)
New commits:
commit 12dea20c2834d923cd51eeb032489e74b5f9982d
Author: Thorsten Behrens tbehr...@suse.com
Date: Wed May 15 11:31:11 2013 +0200
Fix build.
Change-Id: I5b2de61407924cdde5d74a7ea639365a876de74e
diff --git a/include/xmloff/unointerfacetouniqueidentifiermapper.hxx
b/include/xmloff/unointerfacetouniqueidentifiermapper.hxx
index 6ec3700..d78fbfb 100644
--- a/include/xmloff/unointerfacetouniqueidentifiermapper.hxx
+++ b/include/xmloff/unointerfacetouniqueidentifiermapper.hxx
@@ -37,7 +37,6 @@ class XMLOFF_DLLPUBLIC UnoInterfaceToUniqueIdentifierMapper
{
public:
UnoInterfaceToUniqueIdentifierMapper();
-~UnoInterfaceToUniqueIdentifierMapper();
/** returns a unique identifier for the given uno object. IF a uno object
is
registered more than once, the returned identifier is always the same.
diff --git a/xmloff/source/core/unointerfacetouniqueidentifiermapper.cxx
b/xmloff/source/core/unointerfacetouniqueidentifiermapper.cxx
index 317ad07..5ef2156 100644
--- a/xmloff/source/core/unointerfacetouniqueidentifiermapper.cxx
+++ b/xmloff/source/core/unointerfacetouniqueidentifiermapper.cxx
@@ -31,14 +31,6 @@
UnoInterfaceToUniqueIdentifierMapper::UnoInterfaceToUniqueIdentifierMapper()
{
}
-UnoInterfaceToUniqueIdentifierMapper::~UnoInterfaceToUniqueIdentifierMapper()
-{
-SAL_WARN_IF( !maReserved.empty(), xmloff,
-there are maReserved.size()
- ids left. This means a data loss: some connection(s) to
shape(s) are missing.
-);
-}
-
const OUString UnoInterfaceToUniqueIdentifierMapper::registerReference( const
Reference XInterface rInterface )
{
// Be certain that the references we store in our table are to the
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0' - 5 commits - cppcanvas/source xmloff/inc xmloff/source
cppcanvas/source/inc/implrenderer.hxx |6
cppcanvas/source/mtfrenderer/emfplus.cxx|5
cppcanvas/source/mtfrenderer/implrenderer.cxx |3
xmloff/inc/xmloff/unointerfacetouniqueidentifiermapper.hxx | 12 +
xmloff/inc/xmloff/xmlmultiimagehelper.hxx | 12 -
xmloff/source/core/unointerfacetouniqueidentifiermapper.cxx | 85 +---
xmloff/source/core/xmlmultiimagehelper.cxx | 12 +
xmloff/source/draw/ximpshap.cxx | 38 -
xmloff/source/draw/ximpshap.hxx |2
xmloff/source/text/XMLTextFrameContext.cxx |2
xmloff/source/text/XMLTextFrameContext.hxx |2
11 files changed, 109 insertions(+), 70 deletions(-)
New commits:
commit 588441537cd0e29e9d3e78a5884287cb498f13bd
Author: Thorsten Behrens tbehr...@suse.com
Date: Wed May 15 11:05:45 2013 +0200
Fix fdo#64512 Handle xml:id correctly on multi-image draw:frames
Fixes a regression from the pick-best-image from draw:frame in ODF,
where before sometimes the XShape got deleted that the
UnoInterfaceToUniqueIdentifierMapper::registerReference stored.
For that, added a
UnoInterfaceToUniqueIdentifierMapper::registerReferenceAlways
function, which overwrites potentially existing earlier entries
with the same identifier string.
This fix was originally much more messy, but then dtardon committed
30b248dfe5bfb8a0649e36f22c943b3feb2f1385 which also fixes this here
bug. Now only sneaking in slightly less involved interface map
handling and a safeguard in ximpshap.cxx.
Change-Id: I87501e43518a5fc2fee166c45a4e2f01718f5228
diff --git a/xmloff/inc/xmloff/unointerfacetouniqueidentifiermapper.hxx
b/xmloff/inc/xmloff/unointerfacetouniqueidentifiermapper.hxx
index 23f5525..b664f7c 100644
--- a/xmloff/inc/xmloff/unointerfacetouniqueidentifiermapper.hxx
+++ b/xmloff/inc/xmloff/unointerfacetouniqueidentifiermapper.hxx
@@ -24,7 +24,6 @@
#include xmloff/dllapi.h
#include sal/types.h
-#include deque
#include map
#include rtl/ustring.hxx
#include com/sun/star/uno/XInterface.hpp
@@ -32,12 +31,10 @@
namespace comphelper
{
-typedef ::std::map rtl::OUString, const ::com::sun::star::uno::Reference
::com::sun::star::uno::XInterface IdMap_t;
+typedef ::std::map rtl::OUString, ::com::sun::star::uno::Reference
::com::sun::star::uno::XInterface IdMap_t;
class XMLOFF_DLLPUBLIC UnoInterfaceToUniqueIdentifierMapper
{
-typedef std::deque rtl::OUString Reserved_t;
-
public:
UnoInterfaceToUniqueIdentifierMapper();
@@ -53,16 +50,12 @@ public:
*/
bool registerReference( const rtl::OUString rIdentifier, const
::com::sun::star::uno::Reference ::com::sun::star::uno::XInterface
rInterface );
-/** reserves an identifier for later registration.
-
-@returns
-false, if the identifier already exists
- */
-bool reserveIdentifier( const rtl::OUString rIdentifier );
+/** always registers the given uno object with the given identifier.
-/** registers the given uno object with reserved identifier.
- */
-bool registerReservedReference( const rtl::OUString rIdentifier, const
com::sun::star::uno::Reference com::sun::star::uno::XInterface rInterface );
+In contrast to registerReference(), this here overwrites any
+earlier registration of the same identifier
+*/
+void registerReferenceAlways( const rtl::OUString rIdentifier, const
::com::sun::star::uno::Reference ::com::sun::star::uno::XInterface
rInterface );
/** @returns
the identifier for the given uno object. If this uno object is not
already
@@ -79,12 +72,10 @@ public:
private:
bool findReference( const ::com::sun::star::uno::Reference
::com::sun::star::uno::XInterface rInterface, IdMap_t::const_iterator rIter
) const;
bool findIdentifier( const OUString rIdentifier, IdMap_t::const_iterator
rIter ) const;
-bool findReserved( const OUString rIdentifier ) const;
-bool findReserved( const OUString rIdentifier,
Reserved_t::const_iterator rIter ) const;
+void insertReference( const OUString rIdentifier, const
::com::sun::star::uno::Reference ::com::sun::star::uno::XInterface
rInterface );
IdMap_tmaEntries;
sal_Int32 mnNextId;
-Reserved_t maReserved;
};
}
diff --git a/xmloff/source/core/unointerfacetouniqueidentifiermapper.cxx
b/xmloff/source/core/unointerfacetouniqueidentifiermapper.cxx
index 87eb2d3..c0ddf8a 100644
--- a/xmloff/source/core/unointerfacetouniqueidentifiermapper.cxx
+++ b/xmloff/source/core/unointerfacetouniqueidentifiermapper.cxx
@@ -17,8 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include algorithm
-
#include xmloff/unointerfacetouniqueidentifiermapper.hxx
using namespace ::com::sun::star;
@@ -65,42 +63,25 @@ bool
[Libreoffice-commits] core.git: RepositoryExternal.mk
RepositoryExternal.mk |4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) New commits: commit 48e70ad8ad7e8ed11b2b6f511bb0cedd06ab2c98 Author: Caolan McNamara caolan@minimac.(none) Date: Wed May 15 10:30:18 2013 +0100 fix macosx build Change-Id: Ie644af5866eadbee2a3d2840db37676d5c0bdc30 diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index ebf8a55..ecc29d3 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -2866,7 +2866,9 @@ $(call gb_Executable_add_runtime_dependencies,gengal.bin,\ $(call gb_Configuration_get_target,registry) \ $(call gb_Configuration_get_target,fcfg_langpack) \ $(call gb_Library_get_target,$(gb_CPPU_ENV)_uno) \ - $(call gb_Library_get_target,vclplug_svp) \ + $(if $(filter-out MACOSX,$(OS)), \ + $(call gb_Library_get_target,vclplug_svp) \ + ) \ $(call gb_Package_get_target_for_build,cppuhelper_unorc) \ $(call gb_Rdb_get_outdir_target_for_build,ure/services) \ $(call gb_UnoApi_get_target,offapi) \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Export of images in draw/impress is gone.
Hi, I tried to export a draw document as image and noticed that no graphic format is available for export anymore. Is it possible that commit [1] or [2] is responsible for this? Regards, Tomaž [1] - http://cgit.freedesktop.org/libreoffice/core/commit/?id=67dd958fdbaf4949d188d825b0724615966129d0 [2] - http://cgit.freedesktop.org/libreoffice/core/commit/?id=c058341b6de3730b404f44347bea408243416379 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PUSHED] Use clock_gettime instead of gettimeofday to have more preci...
On Wed, May 15, 2013 at 3:07 AM, Stephan Bergmann sberg...@redhat.com wrote: On 05/13/2013 06:59 PM, Norbert Thiebaud (via Code Review) wrote: Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3841 Just saw the hotspot-...@openjdk.java.net thread Mac OS X System.nanoTime Improvements starting at http://mail.openjdk.java.net/pipermail/hotspot-dev/2013-May/009496.html that might be interesting for us, too. yep. I have some code to that effect in my own stuff... the only gotcha is that that require a static initial value... since the function in question give you tick since the begenning of the program... so you need to convert t=0 to a real time once and store it in a static variable to be able to provide an emulation of clock_getttime I'm concerned about static variable in ure... and how to properly and racelessly initialize it... Norbert ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fix for fdo#53031
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3914 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/14/3914/1 fix for fdo#53031 Change-Id: I137f2446d08b7b536ded26676132e63489e26e48 --- M sc/source/ui/undo/undotab.cxx M sc/source/ui/view/viewfun2.cxx 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/sc/source/ui/undo/undotab.cxx b/sc/source/ui/undo/undotab.cxx index 3c1ef77..db101dd 100644 --- a/sc/source/ui/undo/undotab.cxx +++ b/sc/source/ui/undo/undotab.cxx @@ -355,6 +355,7 @@ pDoc-SetVisible( nTab, pRefUndoDoc-IsVisible( nTab ) ); pDoc-SetTabBgColor( nTab, pRefUndoDoc-GetTabBgColor(nTab) ); pDoc-SetSheetEvents( nTab, pRefUndoDoc-GetSheetEvents( nTab ) ); +pDoc-SetLayoutRTL( nTab, pRefUndoDoc-IsLayoutRTL( nTab ) ); if ( pRefUndoDoc-IsTabProtected( nTab ) ) pDoc-SetTabProtection(nTab, pRefUndoDoc-GetTabProtection(nTab)); diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx index b61d3ab..0b6f48c 100644 --- a/sc/source/ui/view/viewfun2.cxx +++ b/sc/source/ui/view/viewfun2.cxx @@ -2170,6 +2170,7 @@ pUndoDoc-SetVisible( nTab, pDoc-IsVisible( nTab ) ); pUndoDoc-SetTabBgColor( nTab, pDoc-GetTabBgColor(nTab) ); pUndoDoc-SetSheetEvents( nTab, pDoc-GetSheetEvents( nTab ) ); +pUndoDoc-SetLayoutRTL( nTab, pDoc-IsLayoutRTL( nTab ) ); if ( pDoc-IsTabProtected( nTab ) ) pUndoDoc-SetTabProtection(nTab, pDoc-GetTabProtection(nTab)); -- To view, visit https://gerrit.libreoffice.org/3914 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I137f2446d08b7b536ded26676132e63489e26e48 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Manal Alhassoun malhass...@kacst.edu.sa ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Export of images in draw/impress is gone.
Hi Tomaž, *, Op 15-05-13 11:39, Tomaž Vajngerl schreef: Hi, I tried to export a draw document as image and noticed that no graphic format is available for export anymore. Is it possible that commit [1] or [2] is responsible for this? Indeed, File Export as GIF for example doesn't work anymore (2 messages: Graphics filter not found and Error saving the document Untitled1: Write Error. The file could not be written. It creates a file of 0 bytes. Using JPG as extension works correctly. I was doing a bisect for another bug, so my current master version is now 4.1.0.0.alpha0+ Build ID: b993c5591e965de3b9e95e32007ea4231b2997d following cgit this is a build of 2013-04-29 08:44:59 , so it is reproducible before the commits you mentioned. [1] - http://cgit.freedesktop.org/libreoffice/core/commit/?id=67dd958fdbaf4949d188d825b0724615966129d0 [2] - http://cgit.freedesktop.org/libreoffice/core/commit/?id=c058341b6de3730b404f44347bea408243416379 I hope this helped. Kind regards, Joren ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0' - 5 commits - oovbaapi/ooo sc/inc sc/qa sc/source
oovbaapi/ooo/vba/excel/XName.idl| 10 +--
sc/inc/nameuno.hxx |3
sc/qa/extras/macros-test.cxx| 28 ++--
sc/qa/unit/data/xls/Names.xls |binary
sc/qa/unit/data/xls/Workbooks.xls |binary
sc/source/ui/vba/vbaapplication.cxx |2
sc/source/ui/vba/vbaname.cxx| 114 +++-
sc/source/ui/vba/vbaname.hxx|5 -
sc/source/ui/vba/vbanames.cxx | 107 -
9 files changed, 173 insertions(+), 96 deletions(-)
New commits:
commit e9281c438b8cd8b34e8cbc1dd05c22e374f21fc0
Author: Noel Power noel.po...@suse.com
Date: Tue May 14 12:07:43 2013 +0100
make some vba Name object attributes read/write and add test document
cherry-picked from fbd74ed44cd011ebab95bb4bc4eb6b15c1272c43
Change-Id: Ibd12835cc5368080a302b3b8d7c6f52ccc434e3c
diff --git a/oovbaapi/ooo/vba/excel/XName.idl b/oovbaapi/ooo/vba/excel/XName.idl
index dc6ba1c..d46dc14 100644
--- a/oovbaapi/ooo/vba/excel/XName.idl
+++ b/oovbaapi/ooo/vba/excel/XName.idl
@@ -37,10 +37,10 @@ interface XName
[attribute] string NameLocal;
[attribute] boolean Visible;
[attribute] string Value;
-[attribute, readonly] string RefersTo;
-[attribute, readonly] string RefersToLocal;
-[attribute, readonly] string RefersToR1C1;
-[attribute, readonly] string RefersToR1C1Local;
+[attribute] string RefersTo;
+[attribute] string RefersToLocal;
+[attribute] string RefersToR1C1;
+[attribute] string RefersToR1C1Local;
[attribute, readonly] XRange RefersToRange;
void Delete( );
diff --git a/sc/qa/extras/macros-test.cxx b/sc/qa/extras/macros-test.cxx
index ad1df32..0ee6b9e 100644
--- a/sc/qa/extras/macros-test.cxx
+++ b/sc/qa/extras/macros-test.cxx
@@ -217,7 +217,10 @@ void ScMacrosTest::testVba()
OUString(Workbooks.),
OUString(vnd.sun.Star.script:VBAProject.testMacros.test?language=Basiclocation=document)
},
-
+{
+OUString(Names.),
+
OUString(vnd.sun.Star.script:VBAProject.testMacros.test?language=Basiclocation=document)
+},
};
rtl::OUString aFileExtension(xls);
diff --git a/sc/qa/unit/data/xls/Names.xls b/sc/qa/unit/data/xls/Names.xls
new file mode 100755
index 000..fcacf9b
Binary files /dev/null and b/sc/qa/unit/data/xls/Names.xls differ
commit b4f069e21378c03a1306220b953eb1172df1a8bd
Author: Noel Power noel.po...@suse.com
Date: Wed May 15 09:50:05 2013 +0100
fix Workbooks.xls unit test ( was failing on windows )
was cherry-picked from f34c31560bb29f90d579a795cd9f7707163c025f
Change-Id: I3f7bac8d071875a462f9f1a7180b8c6da93c8c70
diff --git a/sc/qa/extras/macros-test.cxx b/sc/qa/extras/macros-test.cxx
index 0d792b1..ad1df32 100644
--- a/sc/qa/extras/macros-test.cxx
+++ b/sc/qa/extras/macros-test.cxx
@@ -225,12 +225,9 @@ void ScMacrosTest::testVba()
OUString sTempDirURL;
osl::FileBase:: getTempDirURL( sTempDirURL );
osl::FileBase::getSystemPathFromFileURL( sTempDirURL, sTempDir );
+sTempDir += OUString( SAL_PATHDELIMITER );
+OUString sTestFileName(My Test WorkBook.xls);
Sequence uno::Any aParams;
-if ( !sTempDir.isEmpty() )
-{
-aParams.realloc(1);
-aParams[ 0 ] = sTempDir;
-}
for ( sal_uInt32 i=0; iSAL_N_ELEMENTS( testInfo ); ++i )
{
rtl::OUString aFileName;
@@ -245,6 +242,14 @@ void ScMacrosTest::testVba()
Sequence sal_Int16 aOutParamIndex;
Sequence Any aOutParam;
+bool bWorkbooksHandling = OUString( testInfo[i].sFileBaseName
).equalsAscii(Workbooks.) !sTempDir.isEmpty() ;
+if ( bWorkbooksHandling )
+{
+aParams.realloc(2);
+aParams[ 0 ] = sTempDir;
+aParams[ 1 ] = sTestFileName;
+}
+
SfxObjectShell* pFoundShell =
SfxObjectShell::GetShellFromComponent(xComponent);
CPPUNIT_ASSERT_MESSAGE(Failed to access document shell, pFoundShell);
@@ -256,6 +261,14 @@ void ScMacrosTest::testVba()
std::cout value of Ret rtl::OUStringToOString( aStringRes,
RTL_TEXTENCODING_UTF8 ).getStr() std::endl;
CPPUNIT_ASSERT_MESSAGE( script reported failure,aStringRes == OK );
pFoundShell-DoClose();
+if ( bWorkbooksHandling )
+{
+OUString sFileUrl;
+OUString sFilePath = sTempDir + sTestFileName;
+osl::FileBase::getFileURLFromSystemPath( sFilePath, sFileUrl );
+if ( !sFileUrl.isEmpty() )
+osl::File::remove( sFileUrl );
+}
}
}
diff --git a/sc/qa/unit/data/xls/Workbooks.xls
b/sc/qa/unit/data/xls/Workbooks.xls
index a732167..2e8a7e7 100755
Binary files a/sc/qa/unit/data/xls/Workbooks.xls and
b/sc/qa/unit/data/xls/Workbooks.xls differ
commit 08d66f9960709ab4912177b9adb6b23ab337
Author: Noel Power noel.po...@suse.com
Date: Fri May 10 20:09:04 2013 +0100
try fix build
Re: Euro Converter Wizard
On Tue, 2013-05-14 at 13:44 +0200, Cedric Bosdonnat wrote: On Tue, 2013-05-14 at 12:54 +0200, Xisco Faulí wrote: Euro Converter Wizard has become a bit outdated nowadays and I'm wondering if it'd convenient to get rid of it. Personally I'd do so, but I'd like to hear from you, especially from the libreoffice expect to decide together what's the best. So please, I'd appreciate if you could share your thoughts about it. I'ld be in favor of dropping it too... who is still using that? And if someone wants it, then there are other tools providing that function. FWIW, Euro area enlargment is an ongoing thing, e.g. Latvia and Lithuania are scheduled to join in 2014/2015 (while the last one was Estonia in 2011) so if adding the euro wizard in the first place was a good idea, then presumably its still a good idea to keep it for the purposes of converting lats and litas to euros. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/wrtww8.cxx |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 335c264d508a9c73845b94483475435a0cebfe64
Author: Miklos Vajna vmik...@suse.cz
Date: Wed May 15 11:47:08 2013 +0200
fdo#36876 WW8 filter: fix export of table margins
Actually no testcase, as the export bug does not affect our import
filter. The problem was that we wrote SPRM's, which are properties of
floating tables, so once the user edited the resulting document in Word
and imported it back to Writer, frames around tables got created. Fix
this by only writing floating table SPRM's for tables which are already
in a fly frame.
Regression from cbba191cf0fff148935f24d111cb124bd5a5328b.
Change-Id: Ifeae93100ca80dcde34fc79f69a91064d44ea8f4
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index b3e65223..82233b4 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -2158,7 +2158,9 @@ void
WW8AttributeOutput::TableSpacing(ww8::WW8TableNodeInfoInner::Pointer_t pTab
const SwTable * pTable = pTableTextNodeInfoInner-getTable();
const SwTableFmt * pTableFmt = pTable-GetTableFmt();
-if (pTableFmt != NULL)
+// Writing these SPRM's will make the table a floating one, so only write
+// them in case the table is already inside a frame.
+if (pTableFmt != NULL /* pTable-GetTableNode()-GetFlyFmt()*/)
{
const SvxULSpaceItem rUL = pTableFmt-GetULSpace();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 6 commits - configmgr/source drawinglayer/inc drawinglayer/source sal/inc svgio/inc svgio/source sw/source
configmgr/source/partial.cxx |2
configmgr/source/partial.hxx |8
drawinglayer/inc/drawinglayer/primitive2d/svggradientprimitive2d.hxx |7
drawinglayer/source/primitive2d/svggradientprimitive2d.cxx | 50 +-
sal/inc/rtl/string.hxx |2
svgio/inc/svgio/svgreader/svgnode.hxx|5
svgio/source/svgreader/svggnode.cxx |2
svgio/source/svgreader/svgnode.cxx | 193
+-
svgio/source/svgreader/svgstyleattributes.cxx| 19
sw/source/core/edit/eddel.cxx|5
sw/source/filter/html/htmlatr.cxx|4
11 files changed, 182 insertions(+), 115 deletions(-)
New commits:
commit f03ec4812cfe71f582c5290869f22eadd661b48a
Author: Armin Le Grand a...@apache.org
Date: Wed May 15 09:51:21 2013 +
i121801 Corrected objectBoundingBox case for GradientTransform
diff --git a/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx
b/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx
index 3d64e57..3a51096 100644
--- a/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx
@@ -413,15 +413,19 @@ namespace drawinglayer
// gradient vector defined by Start,End
const basegfx::B2DVector aVector(getEnd() - getStart());
const double fVectorLength(aVector.getLength());
-basegfx::B2DHomMatrix aUnitGradientToGradient;
-aUnitGradientToGradient.scale(fVectorLength, 1.0);
-aUnitGradientToGradient.rotate(atan2(aVector.getY(),
aVector.getX()));
-aUnitGradientToGradient.translate(getStart().getX(),
getStart().getY());
+aUnitGradientToObject.scale(fVectorLength, 1.0);
+aUnitGradientToObject.rotate(atan2(aVector.getY(),
aVector.getX()));
+aUnitGradientToObject.translate(getStart().getX(),
getStart().getY());
+
+if(!getGradientTransform().isIdentity())
+{
+aUnitGradientToObject = getGradientTransform() *
aUnitGradientToObject;
+}
// create full transform from unit gradient coordinates to
object coordinates
// including the SvgGradient transformation
-aUnitGradientToObject = aObjectTransform *
aUnitGradientToGradient;
+aUnitGradientToObject = aObjectTransform *
aUnitGradientToObject;
}
else
{
@@ -433,11 +437,11 @@ namespace drawinglayer
aUnitGradientToObject.scale(aVector.getLength(), 1.0);
aUnitGradientToObject.rotate(atan2(aVector.getY(),
aVector.getX()));
aUnitGradientToObject.translate(aStart.getX(),
aStart.getY());
-}
-if(!getGradientTransform().isIdentity())
-{
-aUnitGradientToObject = getGradientTransform() *
aUnitGradientToObject;
+if(!getGradientTransform().isIdentity())
+{
+aUnitGradientToObject = getGradientTransform() *
aUnitGradientToObject;
+}
}
// create inverse from it
@@ -750,14 +754,17 @@ namespace drawinglayer
{
// interpret in unit coordinate system - object aspect
ratio will scale result
// create unit transform from unit vector to given linear
gradient vector
-basegfx::B2DHomMatrix aUnitGradientToGradient;
+aUnitGradientToObject.scale(getRadius(), getRadius());
+aUnitGradientToObject.translate(getStart().getX(),
getStart().getY());
-aUnitGradientToGradient.scale(getRadius(), getRadius());
-aUnitGradientToGradient.translate(getStart().getX(),
getStart().getY());
+if(!getGradientTransform().isIdentity())
+{
+aUnitGradientToObject = getGradientTransform() *
aUnitGradientToObject;
+}
// create full transform from unit gradient coordinates to
object coordinates
// including the SvgGradient transformation
-aUnitGradientToObject = aObjectTransform *
aUnitGradientToGradient;
+aUnitGradientToObject = aObjectTransform *
aUnitGradientToObject;
}
else
{
@@ -769,11 +776,11 @@ namespace drawinglayer
Re: SolarMutex: please educate me
On Tue, 2013-05-14 at 11:49 +0200, Stephan Bergmann wrote: On 05/13/2013 07:12 PM, Lionel Elie Mamane wrote: Base or Base-related code seems to have some issues around the SolarMutex. https://bugs.freedesktop.org/show_bug.cgi?id=61725 https://bugs.freedesktop.org/show_bug.cgi?id=64241 (and others historically) Please educate me on the SolarMutex. What is its meaning, when should be held/acquired, ... From http://cgit.freedesktop.org/libreoffice/core/commit/?id=b34b8d3372364b3c5043da0357ec69505e8d8602, my guess is that it is related to GUI stuff. Maybe it should be held when calling a GUI (that is, GTK/Win32/QT/...) function? But it can't be that simple, else vcl would just do it... It seems to expect higher-level code to hold it already. Why? Historically, the SolarMutex was assumed to be a clever solution to the problem of turning StarOffice from a single-threaded application to a multi-threaded one---lock the SolarMutex around any code that is not yet thread-safe, and be done with it. Or so people thought. The world has long since found out that single global mutex is a horrible idea for GUI applications (where all GUI frameworks have settled on confine relevant code to run in a single event-loop thread instead). This leaves us with completely unmaintainable (where do I need to lock SolarMutex?---nobody knows for sure) and broken (cf. SolarMutexReleaser) code. Incidentally, I had exactly the same problem with https://gerrit.libreoffice.org/#/c/3894/ TODO: Ensure SolarMutex is locked at DBG_TESTSOLARMUTEX checkpoints last night. Yeah, and I'm continually dithering as to where to put one for the various writer mail merge wizard oh my god its not locked asserts. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: RepositoryExternal.mk
RepositoryExternal.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 2ae649de2494a6990c7953dcd3a737464eee768f Author: Michael Meeks michael.me...@suse.com Date: Wed May 15 11:09:45 2013 +0100 gengal: don't depend on vclplug_svp on Windows. Change-Id: I5d179ab3d8591bb01799dcb2b8eb6b5c2bd90110 diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index ecc29d3..705aacb 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -2866,7 +2866,7 @@ $(call gb_Executable_add_runtime_dependencies,gengal.bin,\ $(call gb_Configuration_get_target,registry) \ $(call gb_Configuration_get_target,fcfg_langpack) \ $(call gb_Library_get_target,$(gb_CPPU_ENV)_uno) \ - $(if $(filter-out MACOSX,$(OS)), \ + $(if $(filter-out MACOSX WNT,$(OS)), \ $(call gb_Library_get_target,vclplug_svp) \ ) \ $(call gb_Package_get_target_for_build,cppuhelper_unorc) \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/wrtww8.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit a935a154c3911b466a9b1c8da3c2cf0be2e0014d
Author: Miklos Vajna vmik...@suse.cz
Date: Wed May 15 12:11:00 2013 +0200
WW8AttributeOutput::TableSpacing: accidently commented out code
Change-Id: Ib4a18dafe4a0b5679e0a015f8208207ae482e720
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index 82233b4..08bf24b 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -2160,7 +2160,7 @@ void
WW8AttributeOutput::TableSpacing(ww8::WW8TableNodeInfoInner::Pointer_t pTab
// Writing these SPRM's will make the table a floating one, so only write
// them in case the table is already inside a frame.
-if (pTableFmt != NULL /* pTable-GetTableNode()-GetFlyFmt()*/)
+if (pTableFmt != NULL pTable-GetTableNode()-GetFlyFmt())
{
const SvxULSpaceItem rUL = pTableFmt-GetULSpace();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 44446] LibreOffice 3.6 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=6 Bug 6 depends on bug 36876, which changed state. Bug 36876 Summary: FILESAVE: When saving in MSWord doc format, table is put inside a frame https://bugs.freedesktop.org/show_bug.cgi?id=36876 What|Removed |Added Status|ASSIGNED|RESOLVED Resolution|--- |FIXED -- 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
[PATCH libreoffice-4-0] fdo#36876 WW8 filter: fix export of table margins
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3915
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/15/3915/1
fdo#36876 WW8 filter: fix export of table margins
Actually no testcase, as the export bug does not affect our import
filter. The problem was that we wrote SPRM's, which are properties of
floating tables, so once the user edited the resulting document in Word
and imported it back to Writer, frames around tables got created. Fix
this by only writing floating table SPRM's for tables which are already
in a fly frame.
Regression from cbba191cf0fff148935f24d111cb124bd5a5328b.
(cherry picked from commits 335c264d508a9c73845b94483475435a0cebfe64 and
a935a154c3911b466a9b1c8da3c2cf0be2e0014d)
Change-Id: Ifeae93100ca80dcde34fc79f69a91064d44ea8f4
---
M sw/source/filter/ww8/wrtww8.cxx
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index 269b913..2ee4569 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -2121,7 +2121,9 @@
const SwTable * pTable = pTableTextNodeInfoInner-getTable();
const SwTableFmt * pTableFmt = pTable-GetTableFmt();
-if (pTableFmt != NULL)
+// Writing these SPRM's will make the table a floating one, so only write
+// them in case the table is already inside a frame.
+if (pTableFmt != NULL pTable-GetTableNode()-GetFlyFmt())
{
const SvxULSpaceItem rUL = pTableFmt-GetULSpace();
--
To view, visit https://gerrit.libreoffice.org/3915
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifeae93100ca80dcde34fc79f69a91064d44ea8f4
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Miklos Vajna vmik...@suse.cz
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: solenv/gbuild
solenv/gbuild/Gallery.mk |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit ce4ada6e7f4088de9ac2ed22dc2d2312918d3701 Author: Andras Timar ati...@suse.com Date: Wed May 15 11:31:58 2013 +0200 trying to fix gallery localization Change-Id: I9a4fc068e522dd7129b66652c193626075b460bf diff --git a/solenv/gbuild/Gallery.mk b/solenv/gbuild/Gallery.mk index e885382..ae62532 100644 --- a/solenv/gbuild/Gallery.mk +++ b/solenv/gbuild/Gallery.mk @@ -166,9 +166,9 @@ endif $(call gb_Gallery_get_workdir,$(1))/$(1).str : $(gb_Gallery_TRANSLATE) \ $$(call gb_Gallery_get_workdir,$(1))/$(1).ulf cp -f $(SRCDIR)/$(3)/$(1).str $(call gb_Gallery_get_workdir,$(1))/$(1).str \ - $(PERL) $(gb_Gallery_TRANSLATE) -d $(WORKDIR)/$* \ + $(PERL) $(gb_Gallery_TRANSLATE) \ --ext str --key name \ - --template-dir $$(call gb_Gallery_get_workdir,$(1))/ \ + -d $$(call gb_Gallery_get_workdir,$(1))/ \ $$(call gb_Gallery_get_workdir,$(1))/$(1).ulf endef ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 54157] LibreOffice 4.0 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 Michael Meeks michael.me...@novell.com changed: What|Removed |Added Depends on||60565 -- 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: SolarMutex: please educate me
On 2013-05-15 12:09, Caolán McNamara wrote: Yeah, and I'm continually dithering as to where to put one for the various writer mail merge wizard oh my god its not locked asserts. Instead of trying to get locking correct everywhere, perhaps we should be doing a Java-Swing style thing where we (a) do some work in the background (b) post the results to the main event thread to be executed there ?? Disclaimer: http://www.peralex.com/disclaimer.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/rtfattributeoutput.cxx | 17 +++--
1 file changed, 15 insertions(+), 2 deletions(-)
New commits:
commit a0aef8dc44a9ff5899dc920c31a39caeb92043c4
Author: Oliver-Rainer Wittmann o...@apache.org
Date: Wed Jun 27 10:07:50 2012 +
Resolves: #i119803# RTF export for User Fields
implementation for method RtfAttributeOutput::WriteExpand(..)
Found by: ej197us at gmail dot com
Patch by: yuanlin yuanlin.ibm at gmail dot com
Review by: Oliver orw at apache dot org
(cherry picked from commit 4536f0b98bc01850bf016dc1f60f0156cb7eb99e)
Conflicts:
sw/source/filter/ww8/rtfattributeoutput.cxx
Change-Id: I1cde654dadd26e214a1c097fe2e0aeaa376195c2
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx
b/sw/source/filter/ww8/rtfattributeoutput.cxx
index c4bcba1..d726cb5 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -3119,8 +3119,21 @@ void RtfAttributeOutput::FormatFrameDirection( const
SvxFrameDirectionItem rDir
void RtfAttributeOutput::WriteExpand( const SwField* pFld )
{
SAL_INFO(sw.rtf, OSL_THIS_FUNC);
-String sCmd;
-m_rExport.OutputField(pFld, ww::eUNKNOWN, sCmd);
+String sCmd;// for optional Parameters
+switch (pFld-GetTyp()-Which())
+{
+//#i119803# Export user field and DB field for RTF filter
+case RES_DBFLD:
+sCmd = FieldString(ww::eMERGEFIELD);
+// no break !!
+case RES_USERFLD:
+sCmd += pFld-GetTyp()-GetName();
+m_rExport.OutputField(pFld, ww::eNONE, sCmd);
+break;
+default:
+m_rExport.OutputField(pFld, ww::eUNKNOWN, sCmd);
+break;
+}
}
void RtfAttributeOutput::RefField( const SwField /*rFld*/, const String
/*rRef*/ )
___
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' - 45/36f0b98bc01850bf016dc1f60f0156cb7eb99e
45/36f0b98bc01850bf016dc1f60f0156cb7eb99e |1 + 1 file changed, 1 insertion(+) New commits: commit 50cc766906ea1a3418dbd49a8e6d8ae36068799f Author: Caolán McNamara caol...@redhat.com Date: Wed May 15 12:06:07 2013 +0100 Notes added by 'git notes add' diff --git a/45/36f0b98bc01850bf016dc1f60f0156cb7eb99e b/45/36f0b98bc01850bf016dc1f60f0156cb7eb99e new file mode 100644 index 000..7ecf577 --- /dev/null +++ b/45/36f0b98bc01850bf016dc1f60f0156cb7eb99e @@ -0,0 +1 @@ +merged as: a0aef8dc44a9ff5899dc920c31a39caeb92043c4 ___ 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' - 77/b19e35890c81ad128db8b4362cee9ccf63e6bd
77/b19e35890c81ad128db8b4362cee9ccf63e6bd |1 + 1 file changed, 1 insertion(+) New commits: commit 21fb0235dcd313f3a03c05f073a67755f2db26f0 Author: Caolán McNamara caol...@redhat.com Date: Wed May 15 12:08:46 2013 +0100 Notes added by 'git notes add' diff --git a/77/b19e35890c81ad128db8b4362cee9ccf63e6bd b/77/b19e35890c81ad128db8b4362cee9ccf63e6bd new file mode 100644 index 000..7a280ae --- /dev/null +++ b/77/b19e35890c81ad128db8b4362cee9ccf63e6bd @@ -0,0 +1 @@ +prefer: 1857688e1f4ba982d147a9cac69fad948361d1c0 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: SolarMutex: please educate me
On 05/15/2013 12:54 PM, Noel Grandin wrote: On 2013-05-15 12:09, Caolán McNamara wrote: Yeah, and I'm continually dithering as to where to put one for the various writer mail merge wizard oh my god its not locked asserts. Instead of trying to get locking correct everywhere, perhaps we should be doing a Java-Swing style thing where we (a) do some work in the background (b) post the results to the main event thread to be executed there ?? Sure, as I already wrote: all GUI frameworks have settled on 'confine relevant code to run in a single event-loop thread' instead for a reason. However, doing that change is an endeavor far from trivial... Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: scp2/Module_scp2.mk
scp2/Module_scp2.mk |6 -- 1 file changed, 4 insertions(+), 2 deletions(-) New commits: commit 3f70a6c0f8adec171ffd228d109d59bf81dcd39f Author: Michael Meeks michael.me...@suse.com Date: Wed May 15 11:24:29 2013 +0100 scp2: only package the sdk if it is enabled. Change-Id: Id5798c97d3dcfd997ce56f7a7ea72660c9b86c63 diff --git a/scp2/Module_scp2.mk b/scp2/Module_scp2.mk index 5bccae0..9dc1cb6 100644 --- a/scp2/Module_scp2.mk +++ b/scp2/Module_scp2.mk @@ -30,14 +30,16 @@ $(eval $(call gb_Module_add_targets,scp2,\ InstallModule_onlineupdate \ InstallModule_ooo \ InstallModule_python \ - InstallModule_sdkoo \ InstallModule_smoketest \ InstallModule_ure \ InstallModule_writer \ InstallModule_xsltfilter \ - InstallScript_sdkoo \ InstallScript_setup_osl \ InstallScript_test \ + $(if $(filter ODK,$(BUILD_TYPE)), \ + InstallModule_sdkoo \ + InstallScript_sdkoo \ + ) \ $(if $(filter WNT,$(OS)),\ InstallModule_activex \ InstallModule_quickstart \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Euro Converter Wizard
Hello, In that case we should add those currencies to the wizard because they aren't present right now. What about creating an extension of this wizard and dropping it from core so libreoffice wouldn't ship it by default to a large amount of user who are not using it? Regard 2013/5/15 Caolán McNamara caol...@redhat.com On Tue, 2013-05-14 at 13:44 +0200, Cedric Bosdonnat wrote: On Tue, 2013-05-14 at 12:54 +0200, Xisco Faulí wrote: Euro Converter Wizard has become a bit outdated nowadays and I'm wondering if it'd convenient to get rid of it. Personally I'd do so, but I'd like to hear from you, especially from the libreoffice expect to decide together what's the best. So please, I'd appreciate if you could share your thoughts about it. I'ld be in favor of dropping it too... who is still using that? And if someone wants it, then there are other tools providing that function. FWIW, Euro area enlargment is an ongoing thing, e.g. Latvia and Lithuania are scheduled to join in 2014/2015 (while the last one was Estonia in 2011) so if adding the euro wizard in the first place was a good idea, then presumably its still a good idea to keep it for the purposes of converting lats and litas to euros. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - bean/test bridges/test config_host.mk.in embeddedobj/test extensions/qa jurt/workbench libmwaw/ExternalProject_libmwaw.mk libodfgen/ExternalProject_libodfge
bean/test/makefile.mk|4 ++-- bridges/test/java_uno/acquire/makefile.mk| 10 +- bridges/test/java_uno/any/makefile.mk| 10 +- bridges/test/java_uno/equals/makefile.mk |8 bridges/test/java_uno/nativethreadpool/makefile.mk |4 ++-- config_host.mk.in|2 +- embeddedobj/test/Container1/makefile.mk |8 extensions/qa/integration/extensions/makefile.mk |2 +- jurt/workbench/com/sun/star/comp/urlresolver/makefile.mk |2 +- libmwaw/ExternalProject_libmwaw.mk |1 - libodfgen/ExternalProject_libodfgen.mk |1 - libvisio/ExternalProject_libvisio.mk |1 - libwpg/ExternalProject_libwpg.mk |1 - libwps/ExternalProject_libwps.mk |1 - 14 files changed, 25 insertions(+), 30 deletions(-) New commits: commit e78d3245487e9b140caa15b586374e413eba178a Author: Tor Lillqvist tlillqv...@suse.com Date: Wed May 15 13:38:52 2013 +0300 Revert changes that are now unnecessary and pointless This reverts commit a94dc2203539a1593b99778be16b2c664fd46daa. This reverts commit 3baa1c8c9baf6bb35f9d2ff5e002a5403d2d4af4. This reverts commit 4e312f0c90247ccaa138520aa9e080453ec90b64. This reverts commit 050a51b69e89e230e157be52d8b23862f3c06ba8. This reverts commit 9c2a1cb4351c8f80a27b7ba413ad382368387425. diff --git a/libmwaw/ExternalProject_libmwaw.mk b/libmwaw/ExternalProject_libmwaw.mk index 3a0a8f0..82b4a3d 100644 --- a/libmwaw/ExternalProject_libmwaw.mk +++ b/libmwaw/ExternalProject_libmwaw.mk @@ -32,7 +32,6 @@ $(call gb_ExternalProject_get_state_target,libmwaw,build) : --disable-werror \ CXXFLAGS=$(if $(filter NO,$(SYSTEM_BOOST)),-I$(call gb_UnpackedTarball_get_dir,boost),$(BOOST_CPPFLAGS)) \ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ - $(if $(filter MSC,$(COM)),AR=lib.exe SED=sed.exe) \ (cd $(EXTERNAL_WORKDIR)/src/lib $(MAKE)) \ ) diff --git a/libodfgen/ExternalProject_libodfgen.mk b/libodfgen/ExternalProject_libodfgen.mk index 3c9d479..3b0ce21 100644 --- a/libodfgen/ExternalProject_libodfgen.mk +++ b/libodfgen/ExternalProject_libodfgen.mk @@ -33,7 +33,6 @@ $(call gb_ExternalProject_get_state_target,libodfgen,build) : --disable-weffc \ CXXFLAGS=$(if $(filter NO,$(SYSTEM_BOOST)),-I$(call gb_UnpackedTarball_get_dir,boost),$(BOOST_CPPFLAGS)) \ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ - $(if $(filter MSC,$(COM)),SED=sed.exe) \ (cd $(EXTERNAL_WORKDIR)/src $(MAKE)) \ ) diff --git a/libvisio/ExternalProject_libvisio.mk b/libvisio/ExternalProject_libvisio.mk index 66c6a919..3a5ce50 100644 --- a/libvisio/ExternalProject_libvisio.mk +++ b/libvisio/ExternalProject_libvisio.mk @@ -41,7 +41,6 @@ $(call gb_ExternalProject_get_state_target,libvisio,build) : CXXFLAGS=$(if $(filter NO,$(SYSTEM_BOOST)),-I$(call gb_UnpackedTarball_get_dir,boost),$(BOOST_CPPFLAGS)) \ $(if $(filter NO,$(SYSTEM_LIBXML)),-I$(call gb_UnpackedTarball_get_dir,xml2)/include) \ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ - $(if $(filter MSC,$(COM)),AR=lib.exe AWK=awk.exe SED=sed.exe) \ (cd $(EXTERNAL_WORKDIR)/src/lib $(MAKE)) \ ) diff --git a/libwpg/ExternalProject_libwpg.mk b/libwpg/ExternalProject_libwpg.mk index 5c858cb..226474c 100644 --- a/libwpg/ExternalProject_libwpg.mk +++ b/libwpg/ExternalProject_libwpg.mk @@ -30,7 +30,6 @@ $(call gb_ExternalProject_get_state_target,libwpg,build) : --disable-debug \ --disable-werror \ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ - $(if $(filter MSC,$(COM)),AR=lib.exe SED=sed.exe) \ (cd $(EXTERNAL_WORKDIR)/src/lib $(MAKE)) \ ) diff --git a/libwps/ExternalProject_libwps.mk b/libwps/ExternalProject_libwps.mk index 7b586c0..ba1bdb0 100644 --- a/libwps/ExternalProject_libwps.mk +++ b/libwps/ExternalProject_libwps.mk @@ -32,7 +32,6 @@ $(call gb_ExternalProject_get_state_target,libwps,build) : --disable-werror \ CXXFLAGS=$(if $(filter NO,$(SYSTEM_BOOST)),-I$(call gb_UnpackedTarball_get_dir,boost),$(BOOST_CPPFLAGS)) \ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ -
[Libreoffice-commits] core.git: Branch 'feature/calc-group-interpreter' - scp2/Module_scp2.mk
scp2/Module_scp2.mk |6 -- 1 file changed, 4 insertions(+), 2 deletions(-) New commits: commit 0f09da85bacb8f688e26db074ca53d4e9ee6c0fa Author: Michael Meeks michael.me...@suse.com Date: Wed May 15 11:24:29 2013 +0100 scp2: only package the sdk if it is enabled. Change-Id: Id5798c97d3dcfd997ce56f7a7ea72660c9b86c63 diff --git a/scp2/Module_scp2.mk b/scp2/Module_scp2.mk index 5bccae0..9dc1cb6 100644 --- a/scp2/Module_scp2.mk +++ b/scp2/Module_scp2.mk @@ -30,14 +30,16 @@ $(eval $(call gb_Module_add_targets,scp2,\ InstallModule_onlineupdate \ InstallModule_ooo \ InstallModule_python \ - InstallModule_sdkoo \ InstallModule_smoketest \ InstallModule_ure \ InstallModule_writer \ InstallModule_xsltfilter \ - InstallScript_sdkoo \ InstallScript_setup_osl \ InstallScript_test \ + $(if $(filter ODK,$(BUILD_TYPE)), \ + InstallModule_sdkoo \ + InstallScript_sdkoo \ + ) \ $(if $(filter WNT,$(OS)),\ InstallModule_activex \ InstallModule_quickstart \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Export of images in draw/impress is gone.
On Wed, May 15, 2013 at 11:49 AM, JorenDC joren.libreoff...@telenet.bewrote: Hi Tomaž, *, Indeed, File Export as GIF for example doesn't work anymore (2 messages: Graphics filter not found and Error saving the document Untitled1: Write Error. The file could not be written. It creates a file of 0 bytes. Using JPG as extension works correctly. No no, I can not even select jpg or gif as an export format - these options do not exist. This is with latest LO 4.1 daily build on Windows (I will try Linux version when I get home). Previously graphic filters were defined in ..\LibreOfficeDev 4\share\registry\graphicfilter.xcd but this file does not exist for me. This two commits are changing how things are built and packaged - this is why my suspicion is with this two commits. Regards, Tomaž ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: configmgr/source
configmgr/source/partial.cxx |2 +-
configmgr/source/partial.hxx |7 ---
2 files changed, 5 insertions(+), 4 deletions(-)
New commits:
commit 8d9998f53af1806b06cf659f52607b2ac409a113
Author: Herbert Dürr h...@apache.org
Date: Wed May 15 08:24:08 2013 +
Related: #i122208# avoid default assignment of recursive STL containers
support for recursive STL containers is not required by the standard.
Boost TR1 containers allow them explicitly though but for some compiler/stl
combinations there are constness issues that prevent the default
assignment operator to work. Adding a small helper function solves
this problem in a clean way.
(cherry picked from commit 58d204292c12eb5237106d223251d8855aca3ca2)
Conflicts:
configmgr/source/partial.hxx
Change-Id: I301765e47db12f3b158d4525e896e090f4b81bbb
diff --git a/configmgr/source/partial.cxx b/configmgr/source/partial.cxx
index d2ffa21..77e77e3 100644
--- a/configmgr/source/partial.cxx
+++ b/configmgr/source/partial.cxx
@@ -97,7 +97,7 @@ Partial::Partial(
OUString seg;
bool end = parseSegment(*i, n, seg);
if (end) {
-p-children[seg] = Node();
+p-children[seg].clear();
break;
}
Node::Children::iterator j(p-children.find(seg));
diff --git a/configmgr/source/partial.hxx b/configmgr/source/partial.hxx
index ac78e0f..dd64a39 100644
--- a/configmgr/source/partial.hxx
+++ b/configmgr/source/partial.hxx
@@ -22,13 +22,13 @@
#include sal/config.h
-#include map
+#include boost/unordered_map.hpp // using the boost container because it
explicitly allows recursive types
#include set
#include boost/noncopyable.hpp
#include path.hxx
-
+#include rtl/ustring.hxx
namespace configmgr {
@@ -46,9 +46,10 @@ public:
private:
struct Node {
-typedef std::map OUString, Node Children;
+typedef boost::unordered_map OUString, Node, OUStringHash Children;
Node(): startInclude(false) {}
+void clear() { startInclude=false; children.clear(); }
Children children;
bool startInclude;
___
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' - 58/d204292c12eb5237106d223251d8855aca3ca2
58/d204292c12eb5237106d223251d8855aca3ca2 |1 + 1 file changed, 1 insertion(+) New commits: commit 2379201f54ac6195741fb5c097671411b161faee Author: Caolán McNamara caol...@redhat.com Date: Wed May 15 12:49:34 2013 +0100 Notes added by 'git notes add' diff --git a/58/d204292c12eb5237106d223251d8855aca3ca2 b/58/d204292c12eb5237106d223251d8855aca3ca2 new file mode 100644 index 000..508bf5d --- /dev/null +++ b/58/d204292c12eb5237106d223251d8855aca3ca2 @@ -0,0 +1 @@ +merged as: 8d9998f53af1806b06cf659f52607b2ac409a113 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Euro Converter Wizard
That sounds great :) Thomas On 15.05.2013 13:24, Xisco Faulí wrote: Hello, In that case we should add those currencies to the wizard because they aren't present right now. What about creating an extension of this wizard and dropping it from core so libreoffice wouldn't ship it by default to a large amount of user who are not using it? Regard 2013/5/15 Caolán McNamara caol...@redhat.com mailto:caol...@redhat.com On Tue, 2013-05-14 at 13:44 +0200, Cedric Bosdonnat wrote: On Tue, 2013-05-14 at 12:54 +0200, Xisco Faulí wrote: Euro Converter Wizard has become a bit outdated nowadays and I'm wondering if it'd convenient to get rid of it. Personally I'd do so, but I'd like to hear from you, especially from the libreoffice expect to decide together what's the best. So please, I'd appreciate if you could share your thoughts about it. I'ld be in favor of dropping it too... who is still using that? And if someone wants it, then there are other tools providing that function. FWIW, Euro area enlargment is an ongoing thing, e.g. Latvia and Lithuania are scheduled to join in 2014/2015 (while the last one was Estonia in 2011) so if adding the euro wizard in the first place was a good idea, then presumably its still a good idea to keep it for the purposes of converting lats and litas to euros. C. ___ 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: Branch 'libreoffice-4-0' - sw/source
sw/source/filter/ww8/wrtww8.cxx |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit dc6c363f0c7fec8be700b272ea94eebc8e3534a9
Author: Miklos Vajna vmik...@suse.cz
Date: Wed May 15 11:47:08 2013 +0200
fdo#36876 WW8 filter: fix export of table margins
Actually no testcase, as the export bug does not affect our import
filter. The problem was that we wrote SPRM's, which are properties of
floating tables, so once the user edited the resulting document in Word
and imported it back to Writer, frames around tables got created. Fix
this by only writing floating table SPRM's for tables which are already
in a fly frame.
Regression from cbba191cf0fff148935f24d111cb124bd5a5328b.
(cherry picked from commits 335c264d508a9c73845b94483475435a0cebfe64 and
a935a154c3911b466a9b1c8da3c2cf0be2e0014d)
Change-Id: Ifeae93100ca80dcde34fc79f69a91064d44ea8f4
Reviewed-on: https://gerrit.libreoffice.org/3915
Reviewed-by: LuboÅ¡ LuÅák l.lu...@suse.cz
Tested-by: LuboÅ¡ LuÅák l.lu...@suse.cz
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index 269b913..2ee4569 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -2121,7 +2121,9 @@ void
WW8AttributeOutput::TableSpacing(ww8::WW8TableNodeInfoInner::Pointer_t pTab
const SwTable * pTable = pTableTextNodeInfoInner-getTable();
const SwTableFmt * pTableFmt = pTable-GetTableFmt();
-if (pTableFmt != NULL)
+// Writing these SPRM's will make the table a floating one, so only write
+// them in case the table is already inside a frame.
+if (pTableFmt != NULL pTable-GetTableNode()-GetFlyFmt())
{
const SvxULSpaceItem rUL = pTableFmt-GetULSpace();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED libreoffice-4-0] fdo#36876 WW8 filter: fix export of table margins
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3915 Approvals: Luboš Luňák: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3915 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ifeae93100ca80dcde34fc79f69a91064d44ea8f4 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Miklos Vajna vmik...@suse.cz Gerrit-Reviewer: Luboš Luňák l.lu...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: SolarMutex: please educate me
On 2013-05-15 13:10, Stephan Bergmann wrote: Sure, as I already wrote: all GUI frameworks have settled on 'confine relevant code to run in a single event-loop thread' instead for a reason. However, doing that change is an endeavor far from trivial... Perhaps one approach would be (a) define a special configure flag --find-bad-ui-threadingg (b) when compiled in that mode, change the SolarMutex code so that it whinges loudly if acquired from outside the event thread (c) create a MediumHack which says Calll configure with --find-bad-ui-threading. Run LO Fix places which are calling back into the event thread to use code like ::pushToEventLoop(.) That way, people of medium C++ skill could gradually chip away at the problem. Regards, Noel. Disclaimer: http://www.peralex.com/disclaimer.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PUSHED] Use clock_gettime instead of gettimeofday to have more preci...
On 05/15/2013 11:40 AM, Norbert Thiebaud wrote: I'm concerned about static variable in ure... and how to properly and racelessly initialize it... There's three options, at least for a POD variable that doesn't incur an atexit destructor: * In environments where HAVE_THREADSAFE_STATICS (config_global.h) is guaranteed to be 1, just use a plain static variable. * Otherwise, use the rtl/instance.hxx machinery. * Or, for code in the sal library, add any necessary initialization to sal_detail_initialize. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Euro Converter Wizard
Xisco, On 15/05/13 13:24, Xisco Faulí wrote: What about creating an extension of this wizard and dropping it from core so libreoffice wouldn't ship it by default to a large amount of user who are not using it? You will always find features that many people don't use. That is the fate of a project with huge diverse user-base. So, if the wizard is lame and non-functional and nobody will ever use it, nice to get rid of it. But if we start to get rid of features that a large amount of users don't use, we will find ourselves in a situation where we will ship the bare bones and a manual about how to find this and that in extensions. That will for sure increase our adoption rate :) F. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: extras/source
extras/source/gallery/galleries.ulf |2 -- 1 file changed, 2 deletions(-) New commits: commit c066e7a3f92bac3a6744cae9e091778a3a1c0586 Author: Andras Timar ati...@suse.com Date: Wed May 15 13:44:04 2013 +0200 gallery: unused ulf file Change-Id: I9037aa31cbb93d38a656ce463e0a73f8b39245ff diff --git a/extras/source/gallery/galleries.ulf b/extras/source/gallery/galleries.ulf deleted file mode 100644 index 7e1c915..000 --- a/extras/source/gallery/galleries.ulf +++ /dev/null @@ -1,2 +0,0 @@ -[sounds] -en-US = Sounds ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: configure.ac
configure.ac | 17 - 1 file changed, 17 deletions(-) New commits: commit 808e9dee845e96c394a1d8c0b32bfa5cc9991d67 Author: Michael Meeks michael.me...@suse.com Date: Wed May 15 14:06:21 2013 +0100 configure: remove un-used vba-package-format option. Change-Id: I4dcb563dc2368b7979df3da5e0691cd3633cb5a9 diff --git a/configure.ac b/configure.ac index 78dd712..62b6315 100644 --- a/configure.ac +++ b/configure.ac @@ -1215,23 +1215,6 @@ AC_ARG_WITH(referenced-git, GIT_REFERENCE_SRC=$withval , ) -AC_ARG_WITH(vba-package-format, -AS_HELP_STRING([--with-vba-package-format], -[Specify package format for vba compatibility api. Specifying builtin - means the api component and associated type library are part of the - installation set. Specifying extn creates an uno extension that is - part of the installation set (located in the program directory) that - MUST be optionally registered using either the unopkg executeable or the - extension manager gui.]) -[ - Note: builtin is the default, extn can cause - problems. - - Usage: --with-vba-package-format=builtin or - --with-vba-package-format=extn -], -,) - AC_ARG_WITH(theme, AS_HELP_STRING([--with-theme=theme1 theme2...], [Choose which themes to include. By default those themes with an '*' are included. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - scp2/InstallModule_graphicfilter.mk scp2/source
scp2/InstallModule_graphicfilter.mk |4 scp2/source/ooo/file_library_ooo.scp |1 - scp2/source/ooo/module_hidden_ooo.scp |1 + 3 files changed, 5 insertions(+), 1 deletion(-) New commits: commit 8d08ba5e7530580afd61930bfc00ae513962b754 Author: David Tardon dtar...@redhat.com Date: Wed May 15 15:22:16 2013 +0200 install graphicfilter.xcd again Change-Id: I1091b4ff6b700513c7ef5ac41d94972dbb33dcb2 diff --git a/scp2/InstallModule_graphicfilter.mk b/scp2/InstallModule_graphicfilter.mk index f166e25..8d6c5ee 100644 --- a/scp2/InstallModule_graphicfilter.mk +++ b/scp2/InstallModule_graphicfilter.mk @@ -11,6 +11,10 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/graphicfilter)) $(eval $(call gb_InstallModule_use_auto_install_libs,scp2/graphicfilter,graphicfilter)) +$(eval $(call gb_InstallModule_add_scpfiles,scp2/graphicfilter,\ + scp2/source/graphicfilter/file_graphicfilter \ +)) + $(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/graphicfilter,\ scp2/source/graphicfilter/module_graphicfilter \ )) commit 74c02547dde1f70a557c39e60bec129b93d2ecb5 Author: David Tardon dtar...@redhat.com Date: Wed May 15 14:40:00 2013 +0200 put auto-installed libs into the right module The definition of Auto_File_Libs_ALL was not known in module_hidden_ooo.scp, so it was left unexpanded and the unattached files were assigned to the gid_Module_Root. Change-Id: Ie7064da6e02394261a47e88526c073941625dc8c diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 2c51db4..29cb741 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -25,7 +25,6 @@ * / #include macros.inc -#include AutoInstallLibs/ooo #if defined SOLAR_JAVA defined WNT File gid_File_Lib_Accessbridge diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp index e26aa92..8f06a6e 100644 --- a/scp2/source/ooo/module_hidden_ooo.scp +++ b/scp2/source/ooo/module_hidden_ooo.scp @@ -26,6 +26,7 @@ / #include macros.inc +#include AutoInstallLibs/ooo #ifdef AIX #ifndef SYSTEM_CURL ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Export of images in draw/impress is gone.
Hi, On Wed, May 15, 2013 at 11:39:06AM +0200, Tomaž Vajngerl wrote: Hi, I tried to export a draw document as image and noticed that no graphic format is available for export anymore. Fixed by commit 8d08ba5e7530580afd61930bfc00ae513962b754 . D. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: formula/source framework/source linguistic/source linguistic/workben lotuswordpro/source padmin/source reportdesign/source sc/source
formula/source/ui/dlg/formula.cxx | 18 ++---
framework/source/uielement/langselectionmenucontroller.cxx | 24 +++
linguistic/source/misc2.cxx|9 --
linguistic/workben/sspellimp.cxx |6 -
lotuswordpro/source/filter/lwptblformula.cxx | 42 -
padmin/source/adddlg.cxx |8 +-
padmin/source/cmddlg.cxx |5 -
padmin/source/padialog.cxx | 13 +---
padmin/source/prtsetup.cxx |4 -
reportdesign/source/ui/dlg/AddField.cxx|5 -
sc/source/core/data/stlpool.cxx| 20 +++---
11 files changed, 61 insertions(+), 93 deletions(-)
New commits:
commit 8a9448aabcee0171b0dc3b0401600de09455fb10
Author: Ricardo Montania rica...@linuxafundo.com.br
Date: Mon May 13 16:14:52 2013 -0300
String.AppendAscii Drop
Signed-off-by: LuboÅ¡ LuÅák l.lu...@suse.cz
https://gerrit.libreoffice.org/#/c/3892/
Change-Id: I12175a81f0a74546b5e00633176f204b9a3fb35c
diff --git a/formula/source/ui/dlg/formula.cxx
b/formula/source/ui/dlg/formula.cxx
index 51bb4e4..4891bd1 100644
--- a/formula/source/ui/dlg/formula.cxx
+++ b/formula/source/ui/dlg/formula.cxx
@@ -823,11 +823,10 @@ void FormulaDlg_Impl::FillControls(sal_Bool rbNext,
sal_Bool rbPrev)
// 2. Page or Edit: show selected function
xub_StrLen nFStart = pData-GetFStart();
-String aFormula= m_pHelper-getCurrentFormula();
+OUString aFormula = OUString(m_pHelper-getCurrentFormula()) + );
xub_StrLen nNextFStart = nFStart;
xub_StrLen nNextFEnd = 0;
-aFormula.AppendAscii(RTL_CONSTASCII_STRINGPARAM( ) ));
DeleteArgs();
const IFunctionDescription* pOldFuncDesc = pFuncDesc;
sal_Bool bTestFlag = sal_False;
@@ -1035,8 +1034,7 @@ IMPL_LINK_NOARG(FormulaDlg_Impl, DblClkHdl)
const IFunctionDescription* pDesc = pFuncPage-GetFuncDesc(nFunc);
m_pHelper-insertEntryToLRUList(pDesc);
-String aFuncName = pFuncPage-GetSelFunctionName();
-aFuncName.AppendAscii(RTL_CONSTASCII_STRINGPARAM( () ));
+OUString aFuncName = OUString( pFuncPage-GetSelFunctionName() ) + ();
m_pHelper-setCurrentFormula(aFuncName);
pMEdit-ReplaceSelected(aFuncName);
@@ -1428,16 +1426,14 @@ void FormulaDlg_Impl::RefInputStartAfter( RefEdit*
/*pEdit*/, RefButton* /*pButt
if( pTheRefEdit )
{
-String aStr = aTitle2;
-aStr += ' ';
-aStr += aFtEditName.GetText();
-aStr.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ( ) );
+OUString aStr = OUString(aTitle2) + + aFtEditName.GetText() + ( ;
+
if( pParaWin-GetActiveLine() 0 )
-aStr.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ...; ) );
+aStr += ...; ;
aStr += pParaWin-GetActiveArgName();
if( pParaWin-GetActiveLine() + 1 nArgs )
-aStr.AppendAscii(RTL_CONSTASCII_STRINGPARAM( ; ... ));
-aStr.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ) ) );
+aStr += ; ...;
+aStr += );
m_pParent-SetText( MnemonicGenerator::EraseAllMnemonicChars( aStr ) );
}
diff --git a/framework/source/uielement/langselectionmenucontroller.cxx
b/framework/source/uielement/langselectionmenucontroller.cxx
index 28a67b9..5bcbbf3 100644
--- a/framework/source/uielement/langselectionmenucontroller.cxx
+++ b/framework/source/uielement/langselectionmenucontroller.cxx
@@ -207,23 +207,23 @@ void LanguageSelectionMenuController::fillPopupMenu(
Reference css::awt::XPopup
if ( pVCLPopupMenu )
pPopupMenu = (PopupMenu *)pVCLPopupMenu-GetMenu();
-String aCmd;
-String aCmd_Dialog;
-String aCmd_Language;
+OUString aCmd;
+OUString aCmd_Dialog;
+OUString aCmd_Language;
if( eMode == MODE_SetLanguageSelectionMenu )
{
-aCmd_Dialog.AppendAscii(.uno:FontDialog?Language:string=*);
-
aCmd_Language.AppendAscii(.uno:LanguageStatus?Language:string=Current_);
+aCmd_Dialog += .uno:FontDialog?Language:string=*;
+aCmd_Language += .uno:LanguageStatus?Language:string=Current_;
}
else if ( eMode == MODE_SetLanguageParagraphMenu )
{
-aCmd_Dialog.AppendAscii(.uno:FontDialogForParagraph);
-
aCmd_Language.AppendAscii(.uno:LanguageStatus?Language:string=Paragraph_);
+aCmd_Dialog += .uno:FontDialogForParagraph;
+aCmd_Language += .uno:LanguageStatus?Language:string=Paragraph_;
}
else if ( eMode == MODE_SetLanguageAllTextMenu )
{
-aCmd_Dialog.AppendAscii(.uno:LanguageStatus?Language:string=*);
-
aCmd_Language.AppendAscii(.uno:LanguageStatus?Language:string=Default_);
+aCmd_Dialog += .uno:LanguageStatus?Language:string=*;
+aCmd_Language += .uno:LanguageStatus?Language:string=Default_;
}
[PUSHED] String.AppendAscii Drop
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3892 -- To view, visit https://gerrit.libreoffice.org/3892 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I12175a81f0a74546b5e00633176f204b9a3fb35c Gerrit-PatchSet: 6 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Ricardo Montania rica...@linuxafundo.com.br Gerrit-Reviewer: Luboš Luňák l.lu...@suse.cz Gerrit-Reviewer: Marcos Souza marcos.souza@gmail.com Gerrit-Reviewer: Matteo Casalin matteo.casa...@yahoo.com Gerrit-Reviewer: Ricardo Montania rica...@linuxafundo.com.br ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - include/toolkit svx/source
include/toolkit/awt/vclxbitmap.hxx |2 +- include/toolkit/awt/vclxdevice.hxx |2 +- include/toolkit/awt/vclxfont.hxx |2 +- include/toolkit/awt/vclxgraphics.hxx |2 +- include/toolkit/awt/vclxmenu.hxx |2 +- include/toolkit/awt/vclxpointer.hxx |2 +- include/toolkit/awt/vclxregion.hxx |2 +- include/toolkit/awt/vclxwindow.hxx |2 +- include/toolkit/helper/macros.hxx|4 ++-- svx/source/gengal/gengal.cxx | 10 ++ 10 files changed, 16 insertions(+), 14 deletions(-) New commits: commit 25f25a2d25b89361312e165456df3c8bc82157bb Author: Stephan Bergmann sberg...@redhat.com Date: Wed May 15 16:04:31 2013 +0200 These functions can throw RuntimeException Change-Id: Ic390ceeb9f52953d5dea6999b194956e90eb4629 diff --git a/include/toolkit/awt/vclxbitmap.hxx b/include/toolkit/awt/vclxbitmap.hxx index a889304..bec8397 100644 --- a/include/toolkit/awt/vclxbitmap.hxx +++ b/include/toolkit/awt/vclxbitmap.hxx @@ -59,7 +59,7 @@ public: // ::com::sun::star::lang::XUnoTunnel static const ::com::sun::star::uno::Sequence sal_Int8 GetUnoTunnelId() throw(); -static VCLXBitmap* GetImplementation( const ::com::sun::star::uno::Reference ::com::sun::star::uno::XInterface rxIFace ) throw(); +static VCLXBitmap* GetImplementation( const ::com::sun::star::uno::Reference ::com::sun::star::uno::XInterface rxIFace ); sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence sal_Int8 rIdentifier ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XTypeProvider diff --git a/include/toolkit/awt/vclxdevice.hxx b/include/toolkit/awt/vclxdevice.hxx index eb48f97..5e3167c 100644 --- a/include/toolkit/awt/vclxdevice.hxx +++ b/include/toolkit/awt/vclxdevice.hxx @@ -73,7 +73,7 @@ public: // ::com::sun::star::lang::XUnoTunnel static const ::com::sun::star::uno::Sequence sal_Int8 GetUnoTunnelId() throw(); -static VCLXDevice* GetImplementation( const ::com::sun::star::uno::Reference ::com::sun::star::uno::XInterface rxIFace ) throw(); +static VCLXDevice* GetImplementation( const ::com::sun::star::uno::Reference ::com::sun::star::uno::XInterface rxIFace ); sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence sal_Int8 rIdentifier ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XTypeProvider diff --git a/include/toolkit/awt/vclxfont.hxx b/include/toolkit/awt/vclxfont.hxx index bb385f2..7159111 100644 --- a/include/toolkit/awt/vclxfont.hxx +++ b/include/toolkit/awt/vclxfont.hxx @@ -62,7 +62,7 @@ public: // ::com::sun::star::lang::XUnoTunnel static const ::com::sun::star::uno::Sequence sal_Int8 GetUnoTunnelId() throw(); -static VCLXFont* GetImplementation( const ::com::sun::star::uno::Reference ::com::sun::star::uno::XInterface rxIFace ) throw(); +static VCLXFont* GetImplementation( const ::com::sun::star::uno::Reference ::com::sun::star::uno::XInterface rxIFace ); sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence sal_Int8 rIdentifier ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XTypeProvider diff --git a/include/toolkit/awt/vclxgraphics.hxx b/include/toolkit/awt/vclxgraphics.hxx index a99e19f..12aeb1b 100644 --- a/include/toolkit/awt/vclxgraphics.hxx +++ b/include/toolkit/awt/vclxgraphics.hxx @@ -83,7 +83,7 @@ public: // ::com::sun::star::lang::XUnoTunnel static const ::com::sun::star::uno::Sequence sal_Int8 GetUnoTunnelId() throw(); -static VCLXGraphics* GetImplementation( const ::com::sun::star::uno::Reference ::com::sun::star::uno::XInterface rxIFace ) throw(); +static VCLXGraphics* GetImplementation( const ::com::sun::star::uno::Reference ::com::sun::star::uno::XInterface rxIFace ); sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence sal_Int8 rIdentifier ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XTypeProvider diff --git a/include/toolkit/awt/vclxmenu.hxx b/include/toolkit/awt/vclxmenu.hxx index 495e898..32b7775 100644 --- a/include/toolkit/awt/vclxmenu.hxx +++ b/include/toolkit/awt/vclxmenu.hxx @@ -83,7 +83,7 @@ public: // ::com::sun::star::lang::XUnoTunnel static const ::com::sun::star::uno::Sequence sal_Int8 GetUnoTunnelId() throw(); -static VCLXMenu*
[Libreoffice-commits] core.git: sd/source
sd/source/filter/eppt/epptso.cxx | 57 ---
1 file changed, 42 insertions(+), 15 deletions(-)
New commits:
commit 8c23e31acc61406103c1565960e4c5b391902754
Author: Andre Fischer a...@apache.org
Date: Mon Jul 9 08:04:21 2012 +
Resolves: #i119551# Avoid grouping shapes on import from PPT...
under certain conditions.
Reported by: Li Feng Wang
Patch and review by: Ma Bingbing and Armin Le Grand
(cherry picked from commit f425d556504e055216d9402241ff598a97204509)
Conflicts:
sd/source/filter/eppt/epptso.cxx
Change-Id: I7e610b754ff7215201bc1ac47d618869e4e8fe2b
diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx
index 356ddfb..65c5b33 100644
--- a/sd/source/filter/eppt/epptso.cxx
+++ b/sd/source/filter/eppt/epptso.cxx
@@ -2242,7 +2242,10 @@ void PPTWriter::ImplCreateTextShape(
EscherPropertyContainer rPropOpt, EscherSo
void PPTWriter::ImplWritePage( const PHLayout rLayout, EscherSolverContainer
aSolverContainer, PageType ePageType, sal_Bool bMasterPage, int nPageNumber )
{
-sal_uInt32 nInstance, nGroups, nShapes, nShapeCount, nPer, nLastPer,
nIndices, nGroupLevel = 0, nOlePictureId;
+// #i119551# PPT does not support groups of polygons and text (MS patch
KB2289187)
+// sal_uInt32 nGroupLevel = 0;
+
+sal_uInt32 nInstance, nGroups, nShapes, nShapeCount, nPer, nLastPer,
nIndices, nOlePictureId;
sal_uInt16 nEffectCount;
::com::sun::star::awt::Point aTextRefPoint;
@@ -2497,8 +2500,9 @@ void PPTWriter::ImplWritePage( const PHLayout rLayout,
EscherSolverContainer a
aPolygon.Rotate( aRect.TopLeft(), (sal_uInt16)(
mnAngle / 10 ) );
if ( ImplGetText() )
{
-mpPptEscherEx-EnterGroup( 0,0 );
-nGroupLevel = mpPptEscherEx-GetGroupLevel();
+// #i119551# PPT does not support groups of
polygons and text (MS patch KB2289187)
+// mpPptEscherEx-EnterGroup( 0,0 );
+// nGroupLevel = mpPptEscherEx-GetGroupLevel();
bNeedText = sal_False;
bAdditionalText = sal_True;
mnTextSize = 0;
@@ -2693,7 +2697,8 @@ void PPTWriter::ImplWritePage( const PHLayout rLayout,
EscherSolverContainer a
aTextRefPoint = ::com::sun::star::awt::Point(
maRect.Left(), maRect.Top() );
mnTextSize = 0;
bAdditionalText = sal_True;
-mpPptEscherEx-EnterGroup( maRect,0 );
+// #i119551# PPT does not support groups of polygons and
text (MS patch KB2289187)
+// mpPptEscherEx-EnterGroup( maRect,0 );
}
mpPptEscherEx-OpenContainer( ESCHER_SpContainer );
sal_uInt32 nFlags = 0xa00; //
Flags: Connector | HasSpt
@@ -2711,8 +2716,9 @@ void PPTWriter::ImplWritePage( const PHLayout rLayout,
EscherSolverContainer a
{
if ( ImplGetText() )
{
-mpPptEscherEx-EnterGroup( 0,0 );
-nGroupLevel = mpPptEscherEx-GetGroupLevel();
+// #i119551# PPT does not support groups of polygons and
text (MS patch KB2289187)
+// mpPptEscherEx-EnterGroup( 0,0 );
+// nGroupLevel = mpPptEscherEx-GetGroupLevel();
bAdditionalText = sal_True;
mnTextSize = 0;
}
@@ -2730,8 +2736,9 @@ void PPTWriter::ImplWritePage( const PHLayout rLayout,
EscherSolverContainer a
{
if ( ImplGetText() )
{
-mpPptEscherEx-EnterGroup( 0,0 );
-nGroupLevel = mpPptEscherEx-GetGroupLevel();
+// #i119551# PPT does not support groups of polygons and
text (MS patch KB2289187)
+// mpPptEscherEx-EnterGroup( 0,0 );
+// nGroupLevel = mpPptEscherEx-GetGroupLevel();
bAdditionalText = sal_True;
mnTextSize = 0;
}
@@ -2749,8 +2756,9 @@ void PPTWriter::ImplWritePage( const PHLayout rLayout,
EscherSolverContainer a
{
if ( ImplGetText() )
{
-mpPptEscherEx-EnterGroup( 0,0 );
-nGroupLevel = mpPptEscherEx-GetGroupLevel();
+// #i119551# PPT does not support groups of polygons and
text (MS patch KB2289187)
+// mpPptEscherEx-EnterGroup( 0,0 );
+// nGroupLevel = mpPptEscherEx-GetGroupLevel();
bAdditionalText = sal_True;
mnTextSize = 0;
}
@@ -2768,8 +2776,9 @@ void
[Libreoffice-commits] core.git: sc/inc sc/source
sc/inc/scabstdlg.hxx |2 +-
sc/source/ui/attrdlg/scdlgfact.cxx |2 +-
sc/source/ui/attrdlg/scdlgfact.hxx |2 +-
sc/source/ui/pagedlg/hfedtdlg.cxx |9 +++--
4 files changed, 6 insertions(+), 9 deletions(-)
New commits:
commit 387c6712c8c49ec7f4521f2c5ac615c355039352
Author: Olivier Hallot olivier.hal...@edx.srv.br
Date: Tue May 14 21:34:18 2013 -0300
String to OUString in calc header footer edit
Conflicts:
sc/inc/scabstdlg.hxx
sc/source/ui/attrdlg/scdlgfact.cxx
sc/source/ui/attrdlg/scdlgfact.hxx
sc/source/ui/inc/hfedtdlg.hxx
sc/source/ui/pagedlg/hfedtdlg.cxx
Change-Id: I6aa0f055f89c05c3d799b5ed1b21188f7f3a8268
Reviewed-on: https://gerrit.libreoffice.org/3911
Reviewed-by: Andras Timar ati...@suse.com
Tested-by: Andras Timar ati...@suse.com
diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index 93bae5a..9a0edf4 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -491,7 +491,7 @@ public:
virtual SfxAbstractTabDialog * CreateScHFEditDlg( SfxViewFrame*
pFrame, //add for ScHFEditDlg
Window* pParent,
const SfxItemSet
rCoreSet,
-const String
rPageStyle,
+const OUString
rPageStyle,
sal_uInt16
nResId = RID_SCDLG_HFEDIT ) = 0;
virtual SfxAbstractTabDialog * CreateScStyleDlg( Window*
pParent,//add for ScStyleDlg
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx
b/sc/source/ui/attrdlg/scdlgfact.cxx
index 2e1ca49..4a8b9be 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -1237,7 +1237,7 @@ SfxAbstractTabDialog *
ScAbstractDialogFactory_Impl::CreateScAttrDlg(SfxViewFram
SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScHFEditDlg(
SfxViewFrame* pFrame,
Window* pParent,
const
SfxItemSet rCoreSet,
-const
String rPageStyle,
+const
OUString rPageStyle,
sal_uInt16 nResId )
{
SfxTabDialog* pDlg = NULL;
diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx
b/sc/source/ui/attrdlg/scdlgfact.hxx
index 356776d..f207558 100644
--- a/sc/source/ui/attrdlg/scdlgfact.hxx
+++ b/sc/source/ui/attrdlg/scdlgfact.hxx
@@ -558,7 +558,7 @@ public:
virtual SfxAbstractTabDialog * CreateScHFEditDlg( SfxViewFrame*
pFrame, //add for ScHFEditDlg
Window* pParent,
const SfxItemSet
rCoreSet,
-const String
rPageStyle,
+const OUString
rPageStyle,
sal_uInt16
nResId = RID_SCDLG_HFEDIT );
virtual SfxAbstractTabDialog * CreateScStyleDlg( Window*
pParent,//add for ScStyleDlg
diff --git a/sc/source/ui/pagedlg/hfedtdlg.cxx
b/sc/source/ui/pagedlg/hfedtdlg.cxx
index d3d8fa3..ce777e8 100644
--- a/sc/source/ui/pagedlg/hfedtdlg.cxx
+++ b/sc/source/ui/pagedlg/hfedtdlg.cxx
@@ -58,13 +58,10 @@ ScHFEditDlg::ScHFEditDlg( SfxViewFrame* pFrameP,
{
eNumType = ((const SvxPageItem)rCoreSet.Get(ATTR_PAGE)).GetNumType();
-String aTmp = GetText();
+OUString aTmp = GetText();
+
+aTmp += ( + ScGlobal::GetRscString( STR_PAGESTYLE ) + : + rPageStyle
+ );
-aTmp.AppendAscii(RTL_CONSTASCII_STRINGPARAM( ( ));
-aTmp += ScGlobal::GetRscString( STR_PAGESTYLE );
-aTmp.AppendAscii(RTL_CONSTASCII_STRINGPARAM( : ));
-aTmp += rPageStyle;
-aTmp += ')';
SetText( aTmp );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] String to OUString in calc header footer edit
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3911 Approvals: Andras Timar: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3911 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6aa0f055f89c05c3d799b5ed1b21188f7f3a8268 Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Olivier Hallot olivier.hal...@edx.srv.br Gerrit-Reviewer: Andras Timar ati...@suse.com Gerrit-Reviewer: Luboš Luňák l.lu...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - sd/source svx/source
sd/source/filter/eppt/epptso.cxx | 57 +-
svx/source/customshapes/EnhancedCustomShape2d.cxx | 14 +++--
2 files changed, 23 insertions(+), 48 deletions(-)
New commits:
commit d6bebd18b3b25af0024ec3ae5bde17836b0085e3
Author: Caolán McNamara caol...@redhat.com
Date: Wed May 15 15:17:16 2013 +0100
Revert Resolves: #i119551# Avoid grouping shapes on import from PPT...
This reverts commit 8c23e31acc61406103c1565960e4c5b391902754.
wrong one
diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx
index 65c5b33..356ddfb 100644
--- a/sd/source/filter/eppt/epptso.cxx
+++ b/sd/source/filter/eppt/epptso.cxx
@@ -2242,10 +2242,7 @@ void PPTWriter::ImplCreateTextShape(
EscherPropertyContainer rPropOpt, EscherSo
void PPTWriter::ImplWritePage( const PHLayout rLayout, EscherSolverContainer
aSolverContainer, PageType ePageType, sal_Bool bMasterPage, int nPageNumber )
{
-// #i119551# PPT does not support groups of polygons and text (MS patch
KB2289187)
-// sal_uInt32 nGroupLevel = 0;
-
-sal_uInt32 nInstance, nGroups, nShapes, nShapeCount, nPer, nLastPer,
nIndices, nOlePictureId;
+sal_uInt32 nInstance, nGroups, nShapes, nShapeCount, nPer, nLastPer,
nIndices, nGroupLevel = 0, nOlePictureId;
sal_uInt16 nEffectCount;
::com::sun::star::awt::Point aTextRefPoint;
@@ -2500,9 +2497,8 @@ void PPTWriter::ImplWritePage( const PHLayout rLayout,
EscherSolverContainer a
aPolygon.Rotate( aRect.TopLeft(), (sal_uInt16)(
mnAngle / 10 ) );
if ( ImplGetText() )
{
-// #i119551# PPT does not support groups of
polygons and text (MS patch KB2289187)
-// mpPptEscherEx-EnterGroup( 0,0 );
-// nGroupLevel = mpPptEscherEx-GetGroupLevel();
+mpPptEscherEx-EnterGroup( 0,0 );
+nGroupLevel = mpPptEscherEx-GetGroupLevel();
bNeedText = sal_False;
bAdditionalText = sal_True;
mnTextSize = 0;
@@ -2697,8 +2693,7 @@ void PPTWriter::ImplWritePage( const PHLayout rLayout,
EscherSolverContainer a
aTextRefPoint = ::com::sun::star::awt::Point(
maRect.Left(), maRect.Top() );
mnTextSize = 0;
bAdditionalText = sal_True;
-// #i119551# PPT does not support groups of polygons and
text (MS patch KB2289187)
-// mpPptEscherEx-EnterGroup( maRect,0 );
+mpPptEscherEx-EnterGroup( maRect,0 );
}
mpPptEscherEx-OpenContainer( ESCHER_SpContainer );
sal_uInt32 nFlags = 0xa00; //
Flags: Connector | HasSpt
@@ -2716,9 +2711,8 @@ void PPTWriter::ImplWritePage( const PHLayout rLayout,
EscherSolverContainer a
{
if ( ImplGetText() )
{
-// #i119551# PPT does not support groups of polygons and
text (MS patch KB2289187)
-// mpPptEscherEx-EnterGroup( 0,0 );
-// nGroupLevel = mpPptEscherEx-GetGroupLevel();
+mpPptEscherEx-EnterGroup( 0,0 );
+nGroupLevel = mpPptEscherEx-GetGroupLevel();
bAdditionalText = sal_True;
mnTextSize = 0;
}
@@ -2736,9 +2730,8 @@ void PPTWriter::ImplWritePage( const PHLayout rLayout,
EscherSolverContainer a
{
if ( ImplGetText() )
{
-// #i119551# PPT does not support groups of polygons and
text (MS patch KB2289187)
-// mpPptEscherEx-EnterGroup( 0,0 );
-// nGroupLevel = mpPptEscherEx-GetGroupLevel();
+mpPptEscherEx-EnterGroup( 0,0 );
+nGroupLevel = mpPptEscherEx-GetGroupLevel();
bAdditionalText = sal_True;
mnTextSize = 0;
}
@@ -2756,9 +2749,8 @@ void PPTWriter::ImplWritePage( const PHLayout rLayout,
EscherSolverContainer a
{
if ( ImplGetText() )
{
-// #i119551# PPT does not support groups of polygons and
text (MS patch KB2289187)
-// mpPptEscherEx-EnterGroup( 0,0 );
-// nGroupLevel = mpPptEscherEx-GetGroupLevel();
+mpPptEscherEx-EnterGroup( 0,0 );
+nGroupLevel = mpPptEscherEx-GetGroupLevel();
bAdditionalText = sal_True;
mnTextSize = 0;
}
@@ -2776,9 +2768,8 @@ void PPTWriter::ImplWritePage( const PHLayout rLayout,
EscherSolverContainer a
{
if ( ImplGetText() )
{
-
[Libreoffice-commits] core.git: 2 commits - lotuswordpro/source
lotuswordpro/source/filter/lwptblformula.cxx |4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
New commits:
commit d2546346ac07e4a3483c339d202e75b99b9d063b
Author: Tor Lillqvist t...@iki.fi
Date: Wed May 15 17:20:09 2013 +0300
Fix warning: unused variable 'aFuncName' [loplugin]
Change-Id: I34a2726123001de0b867b4f54d6f37c55dbc79f5
diff --git a/lotuswordpro/source/filter/lwptblformula.cxx
b/lotuswordpro/source/filter/lwptblformula.cxx
index 1787e75..1a9fe59 100644
--- a/lotuswordpro/source/filter/lwptblformula.cxx
+++ b/lotuswordpro/source/filter/lwptblformula.cxx
@@ -594,8 +594,6 @@ OUString LwpFormulaFunc::ToString(LwpTableLayout* pCellsMap)
{
OUString aFormula;
-OUString aFuncName = LwpFormulaTools::GetName(m_nTokenType) + ;
-
//Append args
vectorLwpFormulaArg*::iterator aItr;
for (aItr=m_aArgs.begin();aItr!=m_aArgs.end();++aItr)
commit 1a90cecb6ecfdcd2896106c8fd37ced5341e13f7
Author: Tor Lillqvist t...@iki.fi
Date: Wed May 15 17:19:02 2013 +0300
OUString::replaceAt() does not modify the OUString
Change-Id: Id5d712364c3c8a1e4305ad036d9f51c30c2f9e80
diff --git a/lotuswordpro/source/filter/lwptblformula.cxx
b/lotuswordpro/source/filter/lwptblformula.cxx
index 0b69d05..1787e75 100644
--- a/lotuswordpro/source/filter/lwptblformula.cxx
+++ b/lotuswordpro/source/filter/lwptblformula.cxx
@@ -606,7 +606,7 @@ OUString LwpFormulaFunc::ToString(LwpTableLayout* pCellsMap)
//erase the last |
if (!m_aArgs.empty())
{
-aFormula.replaceAt(aFormula.getLength()-1,1,);
+aFormula = aFormula.replaceAt(aFormula.getLength()-1,1,);
}
else
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: lotuswordpro/source
lotuswordpro/source/filter/lwptblformula.cxx |4
1 file changed, 4 insertions(+)
New commits:
commit 4edc81ef04b1682d51ccc8b62f44e59eb6bd3639
Author: Caolán McNamara caol...@redhat.com
Date: Wed May 15 15:29:31 2013 +0100
fix original intent of the lwp import code
revert d2546346ac07e4a3483c339d202e75b99b9d063b
and fix 8a9448aabcee0171b0dc3b0401600de09455fb10
Change-Id: Ide781e4f197d2fc1d42b0cda8e9d901ac1118d08
diff --git a/lotuswordpro/source/filter/lwptblformula.cxx
b/lotuswordpro/source/filter/lwptblformula.cxx
index 1a9fe59..fe1e0c7 100644
--- a/lotuswordpro/source/filter/lwptblformula.cxx
+++ b/lotuswordpro/source/filter/lwptblformula.cxx
@@ -594,6 +594,10 @@ OUString LwpFormulaFunc::ToString(LwpTableLayout*
pCellsMap)
{
OUString aFormula;
+OUString aFuncName = LwpFormulaTools::GetName(m_nTokenType);
+aFormula += aFuncName;
+aFormula += ;//Append a blank space
+
//Append args
vectorLwpFormulaArg*::iterator aItr;
for (aItr=m_aArgs.begin();aItr!=m_aArgs.end();++aItr)
___
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' - da/2c3ed52ae631dba11821f201a2fce49bf18c86
da/2c3ed52ae631dba11821f201a2fce49bf18c86 |1 + 1 file changed, 1 insertion(+) New commits: commit 4c2819da16d135489f38bcac340df66cd550e07a Author: Caolán McNamara caol...@redhat.com Date: Wed May 15 15:34:26 2013 +0100 Notes added by 'git notes add' diff --git a/da/2c3ed52ae631dba11821f201a2fce49bf18c86 b/da/2c3ed52ae631dba11821f201a2fce49bf18c86 new file mode 100644 index 000..408ca31 --- /dev/null +++ b/da/2c3ed52ae631dba11821f201a2fce49bf18c86 @@ -0,0 +1 @@ +merged as: d7c7624024f1da26165869921f340f53026a423d ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] mso-dumper.git: 2 commits - src/docrecord.py src/msodraw.py
src/docrecord.py | 112 +++
src/msodraw.py | 16 +++
2 files changed, 128 insertions(+)
New commits:
commit efe45aa2db26d20e32fb788ef121f144572f76e2
Author: Miklos Vajna vmik...@suse.cz
Date: Wed May 15 16:38:21 2013 +0200
dump OfficeArtClientTextbox
diff --git a/src/msodraw.py b/src/msodraw.py
index b19a5a7..836762c 100644
--- a/src/msodraw.py
+++ b/src/msodraw.py
@@ -61,6 +61,7 @@ class RecordHeader:
FSPGR = 0xF009
FSP = 0xF00A
FOPT= 0xF00B
+FClientTextbox = 0xF00D
FClientAnchor = 0xF010
FClientData = 0xF011
FConnectorRule = 0xF012
@@ -77,6 +78,7 @@ class RecordHeader:
Type.FDG: 'OfficeArtFDG',
Type.FDGGBlock: 'OfficeArtFDGGBlock',
Type.FOPT:'OfficeArtFOPT',
+Type.FClientTextbox: 'OfficeArtClientTextbox',
Type.FClientAnchor: 'OfficeArtClientAnchor',
Type.FClientData: 'OfficeArtClientData',
Type.FSP: 'OfficeArtFSP',
@@ -817,6 +819,19 @@ class FClientData:
recHdl.appendLine('data value=0x%8.8X/' % self.data)
recHdl.appendLine('/clientData')
+class FClientTextbox:
+def __init__ (self, strm):
+self.data = strm.readUnsignedInt(4)
+
+def appendLines (self, recHdl, rh):
+recHdl.appendLine(FClientTextbox content)
+recHdl.appendLine( data: 0x%8.8X%self.data)
+
+def dumpXml(self, recHdl, model, rh):
+recHdl.appendLine('clientTextbox type=OfficeArtClientTextbox')
+recHdl.appendLine('data value=0x%8.8X/' % self.data)
+recHdl.appendLine('/clientTextbox')
+
class SplitMenuColorContainer:
def __init__ (self, strm):
self.smca = []
@@ -993,6 +1008,7 @@ recData = {
RecordHeader.Type.FDGSL: FDGSL,
RecordHeader.Type.FClientAnchor: FClientAnchorSheet,
RecordHeader.Type.FClientData: FClientData,
+RecordHeader.Type.FClientTextbox: FClientTextbox,
RecordHeader.Type.SplitMenuColorContainer: SplitMenuColorContainer,
RecordHeader.Type.TertiaryFOPT: TertiaryFOPT,
}
commit 2c1a12d3ee9bc2468af0111b2ab401d216a36145
Author: Miklos Vajna vmik...@suse.cz
Date: Wed May 15 16:26:17 2013 +0200
dump DefTableShd80Operand
diff --git a/src/docrecord.py b/src/docrecord.py
index caeb48f..f79779f 100644
--- a/src/docrecord.py
+++ b/src/docrecord.py
@@ -482,6 +482,116 @@ class PChgTabsOperand(DOCDirStream):
PChgTabsAdd(self).dump()
print '/pchgTabsOperand'
+# The Ico structure specifies an entry in the color palette that is listed in
the following table.
+Ico = {
+0x00: Red: 0x00, Green: 0x00, Blue: 0x00, fAuto: 0xFF,
+0x01: Red: 0x00, Green: 0x00, Blue: 0x00, fAuto: 0x00,
+0x02: Red: 0x00, Green: 0x00, Blue: 0xFF, fAuto: 0x00,
+0x03: Red: 0x00, Green: 0xFF, Blue: 0xFF, fAuto: 0x00,
+0x04: Red: 0x00, Green: 0xFF, Blue: 0x00, fAuto: 0x00,
+0x05: Red: 0xFF, Green: 0x00, Blue: 0xFF, fAuto: 0x00,
+0x06: Red: 0xFF, Green: 0x00, Blue: 0x00, fAuto: 0x00,
+0x07: Red: 0xFF, Green: 0xFF, Blue: 0x00, fAuto: 0x00,
+0x08: Red: 0xFF, Green: 0xFF, Blue: 0xFF, fAuto: 0x00,
+0x09: Red: 0x00, Green: 0x00, Blue: 0x80, fAuto: 0x00,
+0x0A: Red: 0x00, Green: 0x80, Blue: 0x80, fAuto: 0x00,
+0x0B: Red: 0x00, Green: 0x80, Blue: 0x00, fAuto: 0x00,
+0x0C: Red: 0x80, Green: 0x00, Blue: 0x80, fAuto: 0x00,
+0x0D: Red: 0x80, Green: 0x00, Blue: 0x80, fAuto: 0x00,
+0x0E: Red: 0x80, Green: 0x80, Blue: 0x00, fAuto: 0x00,
+0x0F: Red: 0x80, Green: 0x80, Blue: 0x80, fAuto: 0x00,
+0x10: Red: 0xC0, Green: 0xC0, Blue: 0xC0, fAuto: 0x00,
+}
+
+# The Ipat enumeration is an index to a shading pattern.
+Ipat = {
+0x: ipatAuto,
+0x0001: ipatSolid,
+0x0002: ipatPct5,
+0x0003: ipatPct10,
+0x0004: ipatPct20,
+0x0005: ipatPct25,
+0x0006: ipatPct30,
+0x0007: ipatPct40,
+0x0008: ipatPct50,
+0x0009: ipatPct60,
+0x000A: ipatPct70,
+0x000B: ipatPct75,
+0x000C: ipatPct80,
+0x000D: ipatPct90,
+0x000E: ipatDkHorizontal,
+0x000F: ipatDkVertical,
+0x0010: ipatDkForeDiag,
+0x0011: ipatDkBackDiag,
+0x0012: ipatDkCross,
+0x0013: ipatDkDiagCross,
+0x0014: ipatHorizontal,
+0x0015: ipatVertical,
+0x0016: ipatForeDiag,
+0x0017: ipatBackDiag,
+0x0018: ipatCross,
+0x0019: ipatDiagCross,
+0x0023: ipatPctNew2,
+0x0024: ipatPctNew7,
+0x0025: ipatPctNew12,
+0x0026: ipatPctNew15,
+0x0027: ipatPctNew17,
+0x0028: ipatPctNew22,
+0x0029: ipatPctNew27,
+0x002A:
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 20/2a345c32488dfc0ca6640f80dc2392a62911bc
20/2a345c32488dfc0ca6640f80dc2392a62911bc |1 + 1 file changed, 1 insertion(+) New commits: commit 1b5d1a88567d49f3b65851d4e93eec7bbc6ab9f8 Author: Thorsten Behrens tbehr...@suse.com Date: Wed May 15 16:40:58 2013 +0200 Notes added by 'git notes add' diff --git a/20/2a345c32488dfc0ca6640f80dc2392a62911bc b/20/2a345c32488dfc0ca6640f80dc2392a62911bc new file mode 100644 index 000..e6d55d6 --- /dev/null +++ b/20/2a345c32488dfc0ca6640f80dc2392a62911bc @@ -0,0 +1 @@ +prefer: 450cd772aa734cfcb989c8cedd3c0a454db74a34 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] Documentation update of README.cross
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3916
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/16/3916/1
Documentation update of README.cross
* Fixed typos
* Errant/missing commas fixed
* autogen.lastrun - autogen.input
Change-Id: Ibc0d34f21de661139e622a34d760a6683f394643
---
M README.cross
M cppcanvas/source/mtfrenderer/emfplus.cxx
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/README.cross b/README.cross
index 3d962eb..28e4a333 100644
--- a/README.cross
+++ b/README.cross
@@ -32,7 +32,7 @@
Note that in the case of LibreOffice, it is uncommon to run the
configure script directly. Normally one uses the autogen.sh script.
The autogen.sh script reads command-line options from file called
-autogen.lastrun if it exists. The typical way of working is to keep
+autogen.input if it exists. The typical way of working is to keep
the configure parameters in that file and edit it as needed.
@@ -58,19 +58,19 @@
Cygwin gcc in its -mno-cygwin mode, and a Windows-native MinGW
compiler. The -mno-cygwin mechanism in the Cygwin gcc is rapidly being
obsoleted, if it isn't already, and we have not attempted to try to
-keep it working; in fact we have activly cleaned out mechanisms
+keep it working; in fact we have actively cleaned out mechanisms
related to this. Ditto for native MinGW. If one compiles natively on
Windows, just use a version of Microsoft's compiler. OpenOffice.org
and LibreOffice have been built for Windows all the time using that.
-The only case where it makes sense to use MinGW, is for
+The only case where it makes sense to use MinGW is for
cross-compilation. There is just too much crack involved on Windows
anyway, and it is a semi-miracle that the MSVC build under Cygwin
works as nicely as it does.
MinGW is available as cross-build toolchains pre-packaged in more or
less official packages for many Linux distros including Debian, Fedora
-and openSUSE. For instance the mingw32 packages in the Open Build
+and openSUSE. For instance, the mingw32 packages in the Open Build
Service, running on openSUSE, can be found at:
http://download.opensuse.org/repositories/windows:/mingw:/win32/
diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx
b/cppcanvas/source/mtfrenderer/emfplus.cxx
index 4cfd7b9..1f94496 100644
--- a/cppcanvas/source/mtfrenderer/emfplus.cxx
+++ b/cppcanvas/source/mtfrenderer/emfplus.cxx
@@ -1272,10 +1272,10 @@
rMF type flags size dataSize;
-next = rMF.Tell() + ( size - 12 );
+next = rMF.Tell() + ( size - 12 ); // we subtract the 12 byte
header record and record specific data
if (size 12) {
-SAL_INFO(cppcanvas.emf, Size field is less than 12
bytes);
+SAL_WARN(cppcanvas.emf, Size field is less than 12
bytes, this can't be because the header alone takes up 12 bytes);
}
SAL_INFO(cppcanvas.emf, EMF+ record size: size
type: type flags: flags data size: dataSize);
@@ -1941,7 +1941,7 @@
else
{
SAL_WARN(cppcanvas.emf, ImplRenderer::processEMFPlus:
-size sizelength length);
+size sizelength length .
dataSize is dataSize);
#if OSL_DEBUG_LEVEL 1
dumpWords(rMF, length);
#endif
--
To view, visit https://gerrit.libreoffice.org/3916
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibc0d34f21de661139e622a34d760a6683f394643
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: sd/source
sd/source/filter/eppt/epptso.cxx | 57 ---
1 file changed, 42 insertions(+), 15 deletions(-)
New commits:
commit 578bd45644657a9f7ae99f525eeb5c653103dcf8
Author: Andre Fischer a...@apache.org
Date: Mon Jul 9 08:04:21 2012 +
Resolves: #i119551# Avoid grouping shapes on import from PPT...
under certain conditions.
Reported by: Li Feng Wang
Patch and review by: Ma Bingbing and Armin Le Grand
(cherry picked from commit f425d556504e055216d9402241ff598a97204509)
Conflicts:
sd/source/filter/eppt/epptso.cxx
(cherry picked from commit 8c23e31acc61406103c1565960e4c5b391902754)
Change-Id: I7e610b754ff7215201bc1ac47d618869e4e8fe2b
diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx
index 356ddfb..f5ebfa5 100644
--- a/sd/source/filter/eppt/epptso.cxx
+++ b/sd/source/filter/eppt/epptso.cxx
@@ -2242,7 +2242,10 @@ void PPTWriter::ImplCreateTextShape(
EscherPropertyContainer rPropOpt, EscherSo
void PPTWriter::ImplWritePage( const PHLayout rLayout, EscherSolverContainer
aSolverContainer, PageType ePageType, sal_Bool bMasterPage, int nPageNumber )
{
-sal_uInt32 nInstance, nGroups, nShapes, nShapeCount, nPer, nLastPer,
nIndices, nGroupLevel = 0, nOlePictureId;
+// #i119551# PPT does not support groups of polygons and text (MS patch
KB2289187)
+// sal_uInt32 nGroupLevel = 0;
+
+sal_uInt32 nInstance, nGroups, nShapes, nShapeCount, nPer, nLastPer,
nIndices, nOlePictureId;
sal_uInt16 nEffectCount;
::com::sun::star::awt::Point aTextRefPoint;
@@ -2497,8 +2500,9 @@ void PPTWriter::ImplWritePage( const PHLayout rLayout,
EscherSolverContainer a
aPolygon.Rotate( aRect.TopLeft(), (sal_uInt16)(
mnAngle / 10 ) );
if ( ImplGetText() )
{
-mpPptEscherEx-EnterGroup( 0,0 );
-nGroupLevel = mpPptEscherEx-GetGroupLevel();
+// #i119551# PPT does not support groups of
polygons and text (MS patch KB2289187)
+// mpPptEscherEx-EnterGroup( 0,0 );
+// nGroupLevel = mpPptEscherEx-GetGroupLevel();
bNeedText = sal_False;
bAdditionalText = sal_True;
mnTextSize = 0;
@@ -2693,7 +2697,8 @@ void PPTWriter::ImplWritePage( const PHLayout rLayout,
EscherSolverContainer a
aTextRefPoint = ::com::sun::star::awt::Point(
maRect.Left(), maRect.Top() );
mnTextSize = 0;
bAdditionalText = sal_True;
-mpPptEscherEx-EnterGroup( maRect,0 );
+// #i119551# PPT does not support groups of polygons and
text (MS patch KB2289187)
+// mpPptEscherEx-EnterGroup( maRect,0 );
}
mpPptEscherEx-OpenContainer( ESCHER_SpContainer );
sal_uInt32 nFlags = 0xa00; //
Flags: Connector | HasSpt
@@ -2711,8 +2716,9 @@ void PPTWriter::ImplWritePage( const PHLayout rLayout,
EscherSolverContainer a
{
if ( ImplGetText() )
{
-mpPptEscherEx-EnterGroup( 0,0 );
-nGroupLevel = mpPptEscherEx-GetGroupLevel();
+// #i119551# PPT does not support groups of polygons and
text (MS patch KB2289187)
+// mpPptEscherEx-EnterGroup( 0,0 );
+// nGroupLevel = mpPptEscherEx-GetGroupLevel();
bAdditionalText = sal_True;
mnTextSize = 0;
}
@@ -2730,8 +2736,9 @@ void PPTWriter::ImplWritePage( const PHLayout rLayout,
EscherSolverContainer a
{
if ( ImplGetText() )
{
-mpPptEscherEx-EnterGroup( 0,0 );
-nGroupLevel = mpPptEscherEx-GetGroupLevel();
+// #i119551# PPT does not support groups of polygons and
text (MS patch KB2289187)
+// mpPptEscherEx-EnterGroup( 0,0 );
+// nGroupLevel = mpPptEscherEx-GetGroupLevel();
bAdditionalText = sal_True;
mnTextSize = 0;
}
@@ -2749,8 +2756,9 @@ void PPTWriter::ImplWritePage( const PHLayout rLayout,
EscherSolverContainer a
{
if ( ImplGetText() )
{
-mpPptEscherEx-EnterGroup( 0,0 );
-nGroupLevel = mpPptEscherEx-GetGroupLevel();
+// #i119551# PPT does not support groups of polygons and
text (MS patch KB2289187)
+// mpPptEscherEx-EnterGroup( 0,0 );
+// nGroupLevel = mpPptEscherEx-GetGroupLevel();
bAdditionalText = sal_True;
locking foo ...
I suspect that the appended is a better fix for
https://gerrit.libreoffice.org/#/c/3894/
Though clearly the way this interacts with the boilerplate is not
terribly satisfying :-)
Of course, ideally I'd like to undo -all- the locking, and assume that
in every case we require the solar mutex - except when the GUI thread is
idle - effectively serializing everything on the solar mutex: and then
ease that back in a few, selected cases where threading truly makes
sense but ... ;-)
Thoughts ?
Michael.
diff --git a/forms/source/richtext/richtextmodel.cxx
b/forms/source/richtext/richtextmodel.cxx
index 15dc234..f549b20 100644
--- a/forms/source/richtext/richtextmodel.cxx
+++ b/forms/source/richtext/richtextmodel.cxx
@@ -67,6 +67,9 @@ namespace frm
,m_bSettingEngineText( false )
,m_aModifyListeners ( m_aMutex )
{
+// called from auto-generated factory function via UNO.
+SolarMutexGuard aGuard;
+
DBG_CTOR( ORichTextModel, NULL );
m_nClassId = FormComponentType::TEXTFIELD;
@@ -100,6 +103,9 @@ namespace frm
,m_bSettingEngineText( false )
,m_aModifyListeners ( m_aMutex )
{
+// called from auto-generated factory function via UNO.
+SolarMutexGuard aGuard;
+
DBG_CTOR( ORichTextModel, NULL );
m_aTabStop = _pOriginal-m_aTabStop;
@@ -208,6 +214,9 @@ namespace frm
//
ORichTextModel::~ORichTextModel( )
{
+// called via UNO / auto-generated boilerplate
+SolarMutexGuard aGuard;
+
if ( !OComponentHelper::rBHelper.bDisposed )
{
acquire();
--
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: README.cross
README.cross |8 1 file changed, 4 insertions(+), 4 deletions(-) New commits: commit 91b27bc3d86925e1bb52bd3ab8e2f6f87ededd3f Author: Chris Sherlock chris.sherloc...@gmail.com Date: Thu May 16 00:49:50 2013 +1000 Documentation update of README.cross * Fixed typos * Errant/missing commas fixed * autogen.lastrun - autogen.input Change-Id: Ibc0d34f21de661139e622a34d760a6683f394643 Reviewed-on: https://gerrit.libreoffice.org/3916 Reviewed-by: Tor Lillqvist t...@iki.fi Tested-by: Tor Lillqvist t...@iki.fi diff --git a/README.cross b/README.cross index 3d962eb..28e4a333 100644 --- a/README.cross +++ b/README.cross @@ -32,7 +32,7 @@ below. Note that in the case of LibreOffice, it is uncommon to run the configure script directly. Normally one uses the autogen.sh script. The autogen.sh script reads command-line options from file called -autogen.lastrun if it exists. The typical way of working is to keep +autogen.input if it exists. The typical way of working is to keep the configure parameters in that file and edit it as needed. @@ -58,19 +58,19 @@ This OOo-originated MinGW support attempts to be for both running the Cygwin gcc in its -mno-cygwin mode, and a Windows-native MinGW compiler. The -mno-cygwin mechanism in the Cygwin gcc is rapidly being obsoleted, if it isn't already, and we have not attempted to try to -keep it working; in fact we have activly cleaned out mechanisms +keep it working; in fact we have actively cleaned out mechanisms related to this. Ditto for native MinGW. If one compiles natively on Windows, just use a version of Microsoft's compiler. OpenOffice.org and LibreOffice have been built for Windows all the time using that. -The only case where it makes sense to use MinGW, is for +The only case where it makes sense to use MinGW is for cross-compilation. There is just too much crack involved on Windows anyway, and it is a semi-miracle that the MSVC build under Cygwin works as nicely as it does. MinGW is available as cross-build toolchains pre-packaged in more or less official packages for many Linux distros including Debian, Fedora -and openSUSE. For instance the mingw32 packages in the Open Build +and openSUSE. For instance, the mingw32 packages in the Open Build Service, running on openSUSE, can be found at: http://download.opensuse.org/repositories/windows:/mingw:/win32/ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
