Re: Recent commits on sc/source/ui/condformat/condformatdlg.cxx

[Markus Mohrhard]

Hey,

>
>
> Ah, thanks for making us aware.  I hadn't bothered to look into that unused
> function's provenance.  It just caused a (Mac OS X Clang --enable-werror)
> build to fail, so I bluntly removed it.


It was ok. It was only a problem while I had my 20+ commits unpushed
and each removed method made rebasing much worse.

Regards,
Markus
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [GERRIT] gbuild migration: pyuno module

[Stephan Bergmann]

On 06/12/2012 11:37 PM, David Ostrovsky wrote:

May I ask somebody to check this gerrit-patch on MacOsX? Or may be it
would be simplier to send a file-patch or create a feature branch?
Just let me know.


For the record, I'm currently looking into the gerrit patch on Mac.

Stephan
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Recent commits on sc/source/ui/condformat/condformatdlg.cxx

[Stephan Bergmann]

On 06/12/2012 10:24 PM, Daniel Bankston wrote:

I just happened to notice that your commit
http://cgit.freedesktop.org/libreoffice/core/commit/?id=1c18604836ce8063b80cc8090445bf0c0094c5d8
undid part of Markus's commit
http://cgit.freedesktop.org/libreoffice/core/commit/?id=56de6cce83701f003416ad91b28c0dbca3a3d67e
. I think perhaps this was a work in progress for Markus? I just wanted
to bring it to both of your attention to avoid unnecessary problems and
confusion. Then again maybe you have already communicated about it?


Ah, thanks for making us aware.  I hadn't bothered to look into that 
unused function's provenance.  It just caused a (Mac OS X Clang 
--enable-werror) build to fail, so I bluntly removed it.


Stephan
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [PATCH] Remove unused argument from gridwin.cxx

[Cor Nouws]

Hi,

Eike Rathke wrote (13-06-12 00:56)


That's the old AutoFilter button dialog, now obsoleted by Kohei's new
dialog implemented in LaunchAutoFilterMenu(). In fact
LaunchDataSelectMenu() now is only called with bDataSelect=true so the
entire !bDataSelect code branch and the parameter can be removed.


I see a big (and growing) difference in possibilities and use case for 
the old en new version of the autofilter. If the code still is there, I 
could try to add a Data > Filter > Autofilter simple as second item to 
the menu.
Would that be an idea to ask at UX, or will it introduce 
code-troubles/ugliness?


Cheers,


--
 - Cor
 - http://nl.libreoffice.org

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: pyuno is broken on mingw on current master

[David Tardon]

On Tue, Jun 12, 2012 at 09:17:13AM +0200, David Ostrovsky wrote:
> Hi,
> 
> during my work on gbuild'ification of pyuno module i've seen mingw
> branches in some dmake makefiles.
> 
> That why I have compiled mingw32 on OpenSUSE 12.1
> with option --enable-python=internal and installed it on real Windows 7
> machine and tested pyuno intergration without my gbuild'ification
> patch (the current master).
> 
> If i switch to --enable-python=internal then the build immediatelly
> failing in python module:
> 
> =
> (1/1) Building module python
> =
> Running processes: 1
> Entering /home/david/numpty/workspace/LO-Mingw32/python
> 
> dmake:  Error executing 'cygpath': No such file or directory
> dmake:  Error code -1, while making 'Shell escape'
> Running processes: 0

This comes from a misguided attempt to compile with MinGW on Windows,
done by Sun a couple of years ago. You have to bear in mind that there
is only a handful of configurations of MinGW in use--the tinderboxes and
my Fedora MinGW build. If an external module is not built with either of
them, it is safe to assume it fails to build.

D.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: solenv/bin

[Tor Lillqvist]

 solenv/bin/addsym-macosx.sh |   22 ++
 1 file changed, 22 insertions(+)

New commits:
commit 4965c3cc4b48170ce1c3bc27d033ae9132ae1e4a
Author: Tor Lillqvist 
Date:   Mon May 14 20:08:30 2012 +0300

Add some more information

Change-Id: Iafa671028ce73c2ec3a2706dda60f58aaeda7fda

diff --git a/solenv/bin/addsym-macosx.sh b/solenv/bin/addsym-macosx.sh
index b69f59f..89d8912 100755
--- a/solenv/bin/addsym-macosx.sh
+++ b/solenv/bin/addsym-macosx.sh
@@ -22,8 +22,30 @@ s#^#^#
 s#$#$#' | tr '\n' '|' | sed "s#|\$##" >$2
 
 # Please note that the awk expression expects to get the output of 'nm -gx'!
+
+# The fields in the nm -gx output are apparently (see
+# /usr/include/mach-o/nlist.h>):
+
+#  xx xx   symbol
+# !!  !  !n_value
+# !!  !  n_desc
+# !!  n_sect
+# !n_type
+# n_strx
+
+# Original comment:
 # On Panther we have to filter out symbols with a value "1f" otherwise external
 # symbols will erroneously be added to the generated export symbols list file.
+#
+# Of course it isn't actually the "value" (n_value) of the symbol that
+# is meant, but (as is seen from the use of $2) the n_type .
+#
+# Now, what does a n_type of 1f actually mean? The N_PEXT bit (0x10)
+# is on and the N_EXT (0x01) bit is on. It is what in Mach-O
+# documentation is called "private external". This includes symbols
+# produced by using -fvisibility=hidden. Whether that is a problem I
+# don't know.
+#
 awk -v SYMBOLSREGEXP="`cat $2`" '
 match ($6,SYMBOLSREGEXP) > 0 &&  $6 !~ /_GLOBAL_/ { if (($2 != 1) && ( $2 != 
"1f" ) ) print $6 }'
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 3 commits - config_host.mk.in configure.in external/mingw-dlls m4/ax_boost_base.m4 m4/ax_boost_date_time.m4 RepositoryExternal.mk scp2/InstallModule_ooo.mk scp2/source shell/s

[David Tardon]

 RepositoryExternal.mk  |   14 +
 config_host.mk.in  |4 
 configure.in   |6 
 external/mingw-dlls/makefile.mk|1 
 m4/ax_boost_base.m4|  266 +
 m4/ax_boost_date_time.m4   |  113 
 scp2/InstallModule_ooo.mk  |2 
 scp2/source/ooo/mingw_dlls.scp |6 
 shell/source/backends/wininetbe/wininetbackend.cxx |2 
 vcl/Library_vcl.mk |7 
 10 files changed, 417 insertions(+), 4 deletions(-)

New commits:
commit 204ece187916bd891273b38892d6ba74ae2cfad6
Author: David Tardon 
Date:   Wed Jun 13 06:10:27 2012 +0200

make sure basebmp headers are in place

Change-Id: I8ffa38550f8253ab22f16aa2a1ce392e656c1bd1

diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index a07383c..69c1faa 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -319,12 +319,15 @@ endif
 
 # GUIBASE specific stuff
 
-ifeq ($(GUIBASE),aqua)
-# headers from basebmp are included but the library is not used ?
+ifneq ($(filter headless android,$(GUIBASE)),)
+# even in the case we do not link with basebmp, we still need the headers
+# for some typedefs or enums
 $(eval $(call gb_Library_use_packages,vcl,\
basebmp_inc \
 ))
+endif
 
+ifeq ($(GUIBASE),aqua)
 $(eval $(call gb_Library_add_cxxflags,vcl,\
 $(gb_OBJCXXFLAGS) \
 ))
commit 02d9bd3b14575442a6532915cdb18bb4a69ad35f
Author: David Tardon 
Date:   Tue Jun 12 09:30:12 2012 +0200

fix typo: = -> ==

Change-Id: Iba320b00bdef3704bdfe1abe2a60b8c767a571ec

diff --git a/shell/source/backends/wininetbe/wininetbackend.cxx 
b/shell/source/backends/wininetbe/wininetbackend.cxx
index ac6829e..06855b5 100755
--- a/shell/source/backends/wininetbe/wininetbackend.cxx
+++ b/shell/source/backends/wininetbe/wininetbackend.cxx
@@ -140,7 +140,7 @@ WinInetBackend::WinInetBackend()
 if (!ok)
 {
 DWORD err = GetLastError();
-if (err = ERROR_INSUFFICIENT_BUFFER)
+if (err == ERROR_INSUFFICIENT_BUFFER)
 {
 // allocate sufficient space on the heap
 // insufficient space on the heap results
commit 0f6919cf551507f1cb04ff5cbb04d7d3cd707e5c
Author: David Tardon 
Date:   Wed Jun 6 17:04:01 2012 +0200

better test for system boost date_time lib

This reverts commit 4c2e9fc655b6480ffc7f0feb5d07b8106b6b8e22.

Change-Id: Iea84991ee689240fe6e6ddbc47f44b444f582dde

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 323e5bc..226ee03 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -273,7 +273,19 @@ endif # SYSTEM_HUNSPELL
 ifeq ($(SYSTEM_BOOST),YES)
 
 define gb_LinkTarget__use_boostdatetime
-$(call gb_LinkTarget_add_libs,$(1),-lboost_date_time)
+$(call gb_LinkTarget_set_include,$(1),\
+   $$(INCLUDE) \
+   $(BOOST_CPPFLAGS) \
+)
+
+$(call gb_LinkTarget_add_ldflags,$(1),\
+   $(BOOST_LDFLAGS) \
+)
+
+$(call gb_LinkTarget_add_libs,$(1),\
+   $(BOOST_DATE_TIME_LIB) \
+)
+
 endef
 
 else # !SYSTEM_BOOST
diff --git a/config_host.mk.in b/config_host.mk.in
index 2dbc020..4b6e002 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -22,6 +22,9 @@ export ATL_INCLUDE=@ATL_INCLUDE@
 export ATL_LIB=@ATL_LIB@
 export AWTLIB=@AWTLIB@
 export BARCODE_EXTENSION_PACK=@BARCODE_EXTENSION_PACK@
+export BOOST_CPPFLAGS=@BOOST_CPPFLAGS@
+export BOOST_DATE_TIME_LIB=@BOOST_DATE_TIME_LIB@
+export BOOST_LDFLAGS=@BOOST_LDFLAGS@
 export BSH_JAR=@BSH_JAR@
 export BUILD_DMAKE=@BUILD_DMAKE@
 export BUILD_EPM=@BUILD_EPM@
@@ -295,6 +298,7 @@ export MFC_INCLUDE=@MFC_INCLUDE@
 export MFC_LIB=@MFC_LIB@
 export MINGWCXX=@MINGWCXX@
 export MINGWSTRIP=@MINGWSTRIP@
+export MINGW_BOOST_DATE_TIME_DLL=@MINGW_BOOST_DATE_TIME_DLL@
 export MINGW_CAIRO_DLL=@MINGW_CAIRO_DLL@
 export MINGW_CLIB_DIR=@MINGW_CLIB_DIR@
 export MINGW_CRYPTO_DLL=@MINGW_CRYPTO_DLL@
diff --git a/configure.in b/configure.in
index 48bfd38..36f99bd 100644
--- a/configure.in
+++ b/configure.in
@@ -7331,6 +7331,11 @@ if test "$with_system_boost" = "yes"; then
 fi
 CXXFLAGS=$save_CXXFLAGS
 AC_LANG_POP([C++])
+
+AX_BOOST_BASE
+AX_BOOST_DATE_TIME
+mingw_boost_date_time_dll=`echo $BOOST_DATE_TIME_LIB | sed -e 's/^-l//' -e 
's/\.dll$//'`
+libo_MINGW_CHECK_DLL([BOOST_DATE_TIME], [$mingw_boost_date_time_dll])
 else
 AC_MSG_RESULT([internal])
 BUILD_TYPE="$BUILD_TYPE BOOST"
@@ -7338,6 +7343,7 @@ else
 HAVE_BOOST_UNORDERED_MAP=TRUE
 fi
 AC_SUBST([HAVE_BOOST_UNORDERED_MAP])
+AC_SUBST([MINGW_BOOST_DATE_TIME_DLL])
 AC_SUBST(SYSTEM_BOOST)
 
 dnl ===
diff --git a/external/mingw-dlls/makefile.mk b/external/mingw-dlls/makefile.mk
index 50aa73b..5f1722a 100644
--- a/external/mingw-dlls/makefile.mk
++

[Libreoffice-commits] .: Branch 'feature/gsoc_test_improvements' - sd/Module_sd.mk sd/qa

[Artur Dorda]

 sd/Module_sd.mk|3 --
 sd/qa/unit/regression-test.cxx |   42 +++--
 2 files changed, 21 insertions(+), 24 deletions(-)

New commits:
commit d975aea6c3a8c2e5e8f04e7eea7f86c8bc274c44
Author: Artur Dorda 
Date:   Wed Jun 13 01:30:59 2012 +0200

Usage of XShapeDumper in Impress added

Change-Id: I7abb493d8baaa42a45e24276abdcadbfd186651a

diff --git a/sd/Module_sd.mk b/sd/Module_sd.mk
index d4c080d..af2809a 100644
--- a/sd/Module_sd.mk
+++ b/sd/Module_sd.mk
@@ -44,6 +44,7 @@ ifneq ($(OS),DRAGONFLY)
 $(eval $(call gb_Module_add_check_targets,sd,\
 CppunitTest_sd_uimpress \
 CppunitTest_sd_filters_test \
+CppunitTest_sd_regression_test \
 ))
 endif
 
@@ -52,6 +53,4 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,sd,\
 JunitTest_sd_unoapi \
 ))
 
-# Still a problem in line 16
-#CppunitTest_sd_regression_test \
 # vim: set noet sw=4 ts=4:
diff --git a/sd/qa/unit/regression-test.cxx b/sd/qa/unit/regression-test.cxx
index 4ed5b80..cf39d2c 100644
--- a/sd/qa/unit/regression-test.cxx
+++ b/sd/qa/unit/regression-test.cxx
@@ -56,6 +56,9 @@
 #include 
 #include 
 
+#include 
+#include 
+
 namespace {
 
 bool compareFiles( const rtl::OUString& aFileNameOne, const rtl::OUString& 
aFileNameTwo)
@@ -172,29 +175,24 @@ void SdFiltersTest::test()
 CPPUNIT_ASSERT_MESSAGE( "failed to load", xDocShRef.Is() );
 CPPUNIT_ASSERT_MESSAGE( "not in destruction", 
!xDocShRef->IsInDestruction() );
 
-uno::Reference< frame::XModel > xModel = xDocShRef->GetModel();
-CPPUNIT_ASSERT(xModel.is());
-uno::Reference< frame::XStorable > xStorable( xModel, 
uno::UNO_QUERY_THROW);
-CPPUNIT_ASSERT( xStorable.is());
-
-uno::Sequence< beans::PropertyValue > aArgs(1);
-beans::PropertyValue aValue;
-uno::Any aAny;
-
-aAny <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("impress_svg_Export"));
-
-aValue.Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FilterName"));
-aValue.Value = aAny;
-aValue.State = beans::PropertyState_DIRECT_VALUE;
-
-aArgs[0] = aValue;
-
-rtl::OUString aNewSvgURL = m_aSolverRootURL + 
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/unittest/sd/test2.svg"));
-
-xStorable->storeToURL( aNewSvgURL, aArgs );
-
-compareFiles( getPathFromSrc("/sd/qa/unit/data/svg/test.svg"), 
getPathFromSolver("/unittest/sd/test2.svg") );
+uno::Reference 
xTempModel(xDocShRef->GetDoc()->getUnoModel(), uno::UNO_QUERY_THROW);
+CPPUNIT_ASSERT(xTempModel.is());
+uno::Reference xDrawPagesSupplier 
(xTempModel, uno::UNO_QUERY_THROW);
+CPPUNIT_ASSERT(xDrawPagesSupplier.is());
+uno::Reference< drawing::XDrawPages > xDrawPages = 
xDrawPagesSupplier->getDrawPages();
+CPPUNIT_ASSERT(xDrawPages.is());
 
+XShapeDumper xShapeDumper;
+sal_Int32 nLength = xDrawPages->getCount();
+for (sal_Int32 i = 0; i < nLength; ++i)
+{
+uno::Reference xDrawPage;
+uno::Any aAny = xDrawPages->getByIndex(i);
+aAny >>= xDrawPage;
+uno::Reference< drawing::XShapes > xShapes(xDrawPage, 
uno::UNO_QUERY_THROW);
+rtl::OUString aString = xShapeDumper.dump(xShapes);
+std::cout << aString << std::endl;
+}
 xDocShRef->DoClose();
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [PATCH] Remove unused argument from gridwin.cxx

[Eike Rathke]

Hi,

On Monday, 2012-06-11 08:18:44 +0200, Markus Mohrhard wrote:

> > As written in the previous mail, apparently, SCSTR_ALLFILTER is not used.
> > Therefore I removed SCSTR_ALLFILTER from sc/source/ui/view/gridwin.cxx,
> > where it is passed to a pFilterBox object, but has no effect.
> >
> > To me it looks that SCSTR_ALLFILTER  isn't used anywhere.
> > opengrok shows it in the soource file:
> >
> > http://opengrok.libreoffice.org/xref/core/sc/source/ui/src/scstring.src#589
> > and in the define file:
> >  http://opengrok.libreoffice.org/xref/core/sc/inc/sc.hrc#885
> > Remove it?
> >
> 
> I'm sorry but your analysis is not correct. The string is used there
> to fill the dialog with elements but I have no idea how to invoke this
> dialog. I hope that Eike may have an idea how to open this dialog,
> otherwise we may need to wait for Kohei.

That's the old AutoFilter button dialog, now obsoleted by Kohei's new
dialog implemented in LaunchAutoFilterMenu(). In fact
LaunchDataSelectMenu() now is only called with bDataSelect=true so the
entire !bDataSelect code branch and the parameter can be removed.

So, Cor's analysis indeed was correct, even if maybe not intended ;-)

  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3  9E96 2F1A D073 293C 05FD


pgpXTF7yULsoS.pgp
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Perl String Replace Script

[Joel Madero]

Just a small script for anyone who wants it. Running it in terminal allows
you to search all files in a directory (recursively) and replaces a string
with another string. It also creates a backup (FILENAME.save) of any file
changed. I'm using it to replace object names when needed.

Credit goes to this person who did the real thinking, I just scripted it
because I didn't want to memorize the text of what he came up with:
http://forums.devshed.com/unix-help-35/unix-find-and-replace-text-within-all-files-within-a-146179.html


Joel


perl_string_replace.sh
Description: Bourne shell script
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [PUSHED][PATCH] ODFF: implement missing imaginary functions

[Eike Rathke]

Hi Regina,

On Saturday, 2012-06-09 19:58:26 +0200, Regina Henschel wrote:

> I have added the imaginary functions IMTAN, IMCOT, IMSEC, IMCSC,
> IMSINH, IMCOSH, IMCSCH, IMSECH in AOO. Those are defined in ODFF,
> but not implemented yet.

Fantastic! :-)

Pushed to master with
http://cgit.freedesktop.org/libreoffice/core/commit/?id=e659fbd2779d1f3e6f871a2405db173c5f70d320

Thanks
  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3  9E96 2F1A D073 293C 05FD


pgpmJstFfT0j7.pgp
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [PUSHED-3-5][PATCH-3-5-5] rhbz#678440: Always include User-Agent to avoid 403 from picky servers

[Michael Stahl]

On 12.06.2012 22:42, Fridrich Strba wrote:
> Cherry-picked to 3-5, we need two more people for the 3-5-5 branch.

+1 from me (though i'd give +2 if the patch added a version number to
the value :)

> F.
> 
> On 12/06/12 18:50, Stephan Bergmann wrote:
>> It would be nice if
>> 
>> "rhbz#678440: Always include User-Agent to avoid 403 from picky servers"
>> fixing  "opening
>> urls fails with error 403 on picky servers" could be reviewed for
>> inclusion into libreoffice-3-5 and libreoffice-3-5-5.  I consider the
>> patch low-risk.
>>
>> As the patch would not apply as-is to the 3.5 code line, find attached
>> an adapted 0001-rhbz-678440-Always-include-User-Agent-to-avoid-403-f.patch.
>>
>> Thanks,
>> Stephan
>>
>>
>> ___
>> 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] .: Branch 'libreoffice-3-6' - basic/source

[Michael Stahl]

 basic/source/classes/propacc.cxx |   21 +
 basic/source/inc/propacc.hxx |2 +-
 2 files changed, 14 insertions(+), 9 deletions(-)

New commits:
commit dfa7f7cd91f1860ed0e469b121a5ec0604aea125
Author: Michael Stahl 
Date:   Tue Jun 12 22:25:23 2012 +0200

SbPropertyValues::setPropertyValue doesn't check that property exists

(cherry picked from commit f9c5a36609523317b6634f18d834296c6b3dcb22)

Conflicts:
basic/source/classes/propacc.cxx

Change-Id: Ia63eea0c19bfa750b80f4c99f278f8d144c714a8

diff --git a/basic/source/classes/propacc.cxx b/basic/source/classes/propacc.cxx
index ce9c027..66c6976 100644
--- a/basic/source/classes/propacc.cxx
+++ b/basic/source/classes/propacc.cxx
@@ -34,6 +34,7 @@
 #include 
 
 using com::sun::star::uno::Reference;
+using namespace com::sun::star;
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
 using namespace com::sun::star::beans;
@@ -109,14 +110,20 @@ Reference< XPropertySetInfo > 
SbPropertyValues::getPropertySetInfo(void) throw(
 
 //-
 
-sal_Int32 SbPropertyValues::GetIndex_Impl( const ::rtl::OUString &rPropName ) 
const
+size_t SbPropertyValues::GetIndex_Impl( const ::rtl::OUString &rPropName ) 
const
 {
 PropertyValue **ppPV;
 ppPV = (PropertyValue **)
 bsearch( &rPropName, _aPropVals.GetData(), _aPropVals.Count(),
   sizeof( PropertyValue* ),
   SbCompare_UString_PropertyValue_Impl );
-return ppPV ? ppPV - _aPropVals.GetData() : USHRT_MAX;
+if (!ppPV)
+{
+throw beans::UnknownPropertyException(
+"Property not found: " + rPropName,
+const_cast(*this));
+}
+return ppPV - _aPropVals.GetData();
 }
 
 //
@@ -130,7 +137,7 @@ void SbPropertyValues::setPropertyValue(
 ::com::sun::star::lang::WrappedTargetException,
 ::com::sun::star::uno::RuntimeException)
 {
-sal_Int32 nIndex = GetIndex_Impl( aPropertyName );
+size_t const nIndex = GetIndex_Impl( aPropertyName );
 PropertyValue *pPropVal = _aPropVals.GetObject(
 sal::static_int_cast< sal_uInt16 >(nIndex));
 pPropVal->Value = aValue;
@@ -144,11 +151,9 @@ Any SbPropertyValues::getPropertyValue(
 ::com::sun::star::lang::WrappedTargetException,
 ::com::sun::star::uno::RuntimeException)
 {
-sal_Int32 nIndex = GetIndex_Impl( aPropertyName );
-if ( nIndex != USHRT_MAX )
-return _aPropVals.GetObject(
-sal::static_int_cast< sal_uInt16 >(nIndex))->Value;
-return Any();
+size_t const nIndex = GetIndex_Impl( aPropertyName );
+return _aPropVals.GetObject(
+sal::static_int_cast< sal_uInt16 >(nIndex))->Value;
 }
 
 //
diff --git a/basic/source/inc/propacc.hxx b/basic/source/inc/propacc.hxx
index f8e91d1..431f703 100644
--- a/basic/source/inc/propacc.hxx
+++ b/basic/source/inc/propacc.hxx
@@ -52,7 +52,7 @@ class SbPropertyValues: public SbPropertyValuesHelper
 ::com::sun::star::uno::Reference< 
::com::sun::star::beans::XPropertySetInfo > _xInfo;
 
 private:
-sal_Int32   GetIndex_Impl( const ::rtl::OUString 
&rPropName ) const;
+size_t GetIndex_Impl( const ::rtl::OUString &rPropName ) const;
 
 public:
 SbPropertyValues();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: scaddins/idl scaddins/source sc/inc sc/source sc/util

[Eike Rathke]

 sc/inc/helpids.h|8 
 sc/source/core/tool/addinhelpid.cxx |8 
 sc/source/core/tool/odffmap.cxx |9 +
 sc/util/hidother.src|8 
 scaddins/idl/com/sun/star/sheet/addin/XAnalysis.idl |   32 +++
 scaddins/source/analysis/analysis.cxx   |   80 +
 scaddins/source/analysis/analysis.hrc   |   27 ++-
 scaddins/source/analysis/analysis.hxx   |8 
 scaddins/source/analysis/analysis.src   |  144 
 scaddins/source/analysis/analysis_deffuncnames.src  |   72 
 scaddins/source/analysis/analysis_funcnames.src |   40 
 scaddins/source/analysis/analysishelper.cxx |  172 +++-
 scaddins/source/analysis/analysishelper.hxx |   13 +
 13 files changed, 608 insertions(+), 13 deletions(-)

New commits:
commit e659fbd2779d1f3e6f871a2405db173c5f70d320
Author: Regina Henschel 
Date:   Sat Jun 9 17:34:38 2012 +0200

fdo#51017 ODFF: implement missing imaginary functions [AOO i111609 r1348096]

Adds IMTAN, IMSEC, IMCSC, IMCOT, IMSINH, IMCOSH, IMSECH, IMCSCH spreadsheet
functions.

Change-Id: I04ce0b1fdf787c3d8b2301cd92400e54049494bf

diff --git a/sc/inc/helpids.h b/sc/inc/helpids.h
index e2f6e06..af03708 100644
--- a/sc/inc/helpids.h
+++ b/sc/inc/helpids.h
@@ -387,6 +387,14 @@
 #define HID_AAI_FUNC_OCT2HEX
"SC_HID_AAI_FUNC_OCT2HEX"
 #define HID_AAI_FUNC_CONVERT
"SC_HID_AAI_FUNC_CONVERT"
 #define HID_AAI_FUNC_FACTDOUBLE 
"SC_HID_AAI_FUNC_FACTDOUBLE"
+#define HID_AAI_FUNC_IMTAN  
"SC_HID_AAI_FUNC_IMTAN"
+#define HID_AAI_FUNC_IMSEC  
"SC_HID_AAI_FUNC_IMSEC"
+#define HID_AAI_FUNC_IMCSC  
"SC_HID_AAI_FUNC_IMCSC"
+#define HID_AAI_FUNC_IMCOT  
"SC_HID_AAI_FUNC_IMCOT"
+#define HID_AAI_FUNC_IMSINH 
"SC_HID_AAI_FUNC_IMSINH"
+#define HID_AAI_FUNC_IMCOSH 
"SC_HID_AAI_FUNC_IMCOSH"
+#define HID_AAI_FUNC_IMSECH 
"SC_HID_AAI_FUNC_IMSECH"
+#define HID_AAI_FUNC_IMCSCH 
"SC_HID_AAI_FUNC_IMCSCH"
 
 // DateFunc Addin Functions (max.20) -
 #define HID_DAI_FUNC_DAYSINMONTH
"SC_HID_DAI_FUNC_DAYSINMONTH"
diff --git a/sc/source/core/tool/addinhelpid.cxx 
b/sc/source/core/tool/addinhelpid.cxx
index 67bae51..0442b5a 100644
--- a/sc/source/core/tool/addinhelpid.cxx
+++ b/sc/source/core/tool/addinhelpid.cxx
@@ -91,6 +91,10 @@ const ScUnoAddInHelpId pAnalysisHelpIds[] =
 { "getImargument"   , HID_AAI_FUNC_IMARGUMENT   },
 { "getImconjugate"  , HID_AAI_FUNC_IMCONJUGATE  },
 { "getImcos", HID_AAI_FUNC_IMCOS},
+{ "getImcosh"   , HID_AAI_FUNC_IMCOSH   },
+{ "getImcot", HID_AAI_FUNC_IMCOT},
+{ "getImcsc", HID_AAI_FUNC_IMCSC},
+{ "getImcsch"   , HID_AAI_FUNC_IMCSCH   },
 { "getImdiv", HID_AAI_FUNC_IMDIV},
 { "getImexp", HID_AAI_FUNC_IMEXP},
 { "getImln" , HID_AAI_FUNC_IMLN },
@@ -99,10 +103,14 @@ const ScUnoAddInHelpId pAnalysisHelpIds[] =
 { "getImpower"  , HID_AAI_FUNC_IMPOWER  },
 { "getImproduct", HID_AAI_FUNC_IMPRODUCT},
 { "getImreal"   , HID_AAI_FUNC_IMREAL   },
+{ "getImsec", HID_AAI_FUNC_IMSEC},
+{ "getImsech"   , HID_AAI_FUNC_IMSECH   },
 { "getImsin", HID_AAI_FUNC_IMSIN},
+{ "getImsinh"   , HID_AAI_FUNC_IMSINH   },
 { "getImsqrt"   , HID_AAI_FUNC_IMSQRT   },
 { "getImsub", HID_AAI_FUNC_IMSUB},
 { "getImsum", HID_AAI_FUNC_IMSUM},
+{ "getImtan", HID_AAI_FUNC_IMTAN},
 { "getIntrate"  , HID_AAI_FUNC_INTRATE  },
 { "getIseven"   , HID_AAI_FUNC_ISEVEN   },
 { "getIsodd", HID_AAI_FUNC_ISODD},
diff --git a/sc/source/core/tool/odffmap.cxx b/sc/source/core/tool/odffmap.cxx
index 2129da3..b61f8ad 100644
--- a/sc/source/core/tool/odffmap.cxx
+++ b/sc/source/core/tool/odffmap.cxx
@@ -95,6 +95,14 @@ ScCompiler::AddInMap ScCompiler::maAddInMap[] =
 { "IMSUB", "IMSUB", false, "com.sun.star.sheet.addin.Analysis.getImsub", 
"

[PUSHED] Re: [PATCH} more SV_DECL_PTRARR conversions

[Michael Stahl]

On 12.06.2012 18:20, Noel Grandin wrote:
> Hi
> 
> These patches converts various SV_DECL_PTRARR stuff to std::set and 
> std::vector and boost::ptr_vector in various modules
> 
> Passes "make check" at global level, and compiled with debug=true

pushed, thanks.

a bunch of your patches do this:

>  typedef ::com::sun::star::uno::Reference<
> -::com::sun::star::util::XRefreshListener >* XRefreshListenerPtr;
> -SV_DECL_PTRARR_DEL( XRefreshListenerArr_Impl, XRefreshListenerPtr, 4 )
> +::com::sun::star::util::XRefreshListener > XRefreshListenerRef;
> +typedef boost::ptr_vector XRefreshListenerArr_Impl;

a ptr_vector> is, while not technically wrong, kind of
silly; but you've added these in Calc so i don't care that much :)

patch #16 SbCompare_UString_PropertyValue_Impl doesn't look like a
strict weak ordering to me; while looking at that noticed pre-exiting
problem that the GetIndex_Impl return value is not checked...

patch #21 SfxFilterPtrArr turns out to be unused actually

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 2 commits - ucb/source

[Fridrich Strba]

 ucb/source/ucp/webdav/DAVResourceAccess.cxx |7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit b1d18451a459e0b3d0a715fb93f8104413e804df
Author: Stephan Bergmann 
Date:   Tue Jun 12 18:17:37 2012 +0200

rhbz#678440: Always include User-Agent to avoid 403 from picky servers

(cherry picked from commit 4d0e3127ed2def7212bc05aa860cd06704bb1efe,
with modifications)

Change-Id: I4fa7b45062b0058427f77cf9dc0abebd6b26fb49

Signed-off-by: Fridrich Å trba 

diff --git a/ucb/source/ucp/webdav/DAVResourceAccess.cxx 
b/ucb/source/ucp/webdav/DAVResourceAccess.cxx
index 11b5251..f62ddaf 100644
--- a/ucb/source/ucp/webdav/DAVResourceAccess.cxx
+++ b/ucb/source/ucp/webdav/DAVResourceAccess.cxx
@@ -1151,6 +1151,24 @@ void DAVResourceAccess::getUserRequestHeaders(
 }
 }
 }
+
+// Make sure a User-Agent header is always included, as at least
+// en.wikipedia.org:80 forces back 403 "Scripts should use an informative
+// User-Agent string with contact information, or they may be IP-blocked
+// without notice" otherwise:
+for ( DAVRequestHeaders::iterator i(rRequestHeaders.begin());
+  i != rRequestHeaders.end(); ++i )
+{
+if ( i->first.equalsIgnoreAsciiCaseAsciiL(
+ RTL_CONSTASCII_STRINGPARAM( "User-Agent" ) ) )
+{
+return;
+}
+}
+rRequestHeaders.push_back(
+DAVRequestHeader(
+rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "User-Agent" ) ),
+rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LibreOffice" ) ) ) );
 }
 
 //=
commit a7a4f705904e638f0196e4fd48075bc005d0d43b
Author: Fridrich Å trba 
Date:   Tue Jun 12 23:47:54 2012 +0200

Revert "rhbz#678440: Always include User-Agent to avoid 403 from picky 
servers"

This reverts commit 8dfbb8793407a103ef8c5fa109f0fdf15af9262b.

diff --git a/ucb/source/ucp/webdav/DAVResourceAccess.cxx 
b/ucb/source/ucp/webdav/DAVResourceAccess.cxx
index e669245..11b5251 100644
--- a/ucb/source/ucp/webdav/DAVResourceAccess.cxx
+++ b/ucb/source/ucp/webdav/DAVResourceAccess.cxx
@@ -1151,21 +1151,6 @@ void DAVResourceAccess::getUserRequestHeaders(
 }
 }
 }
-
-// Make sure a User-Agent header is always included, as at least
-// en.wikipedia.org:80 forces back 403 "Scripts should use an informative
-// User-Agent string with contact information, or they may be IP-blocked
-// without notice" otherwise:
-for ( DAVRequestHeaders::iterator i(rRequestHeaders.begin());
-  i != rRequestHeaders.end(); ++i )
-{
-if ( i->first.equalsIgnoreAsciiCase( "User-Agent" ) )
-{
-return;
-}
-}
-rRequestHeaders.push_back(
-DAVRequestHeader( "User-Agent", "LibreOffice" ) );
 }
 
 //=
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [PATCH] - avoid a memset

[Albert Thuswaldner]

Hi,

On Tue, Jun 12, 2012 at 10:53 PM, Marion & Christophe JAILLET
 wrote:
> Hi,
>
> first try to send a patch for libreoffice,

Great!

> Has nothing much is explained on http://www.libreoffice.org/developers-2/,

Follow the second link on that page to the Development wiki page:
http://wiki.documentfoundation.org/Development

> please feel free to tell me how to improve my submissions.

How to prepare a patch:
http://wiki.documentfoundation.org/Development#Preparing_patches

Otherwise feel free to ask, I find this mailing rather friendly and helpful.

Hope it helps.

/Albert
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [GERRIT] gbuild migration: pyuno module

[David Ostrovsky]

On 12.06.2012 15:07, Stephan Bergmann wrote:

On 06/11/2012 12:17 AM, David Ostrovsky wrote:

Still have to test it on Windows and ask somebody to test it in MacosX.


Quick update:  Attached windows.patch allowed me to at least build 
 on Windows (on top of 
recent master).  "Tools - Macros - Organize Macros - Python... - LOdev 
Macros - HelloWord - HelloWOrdPython - Run" within Writer works,

thanks! pushed a new change set to gerrit:
https://gerrit.libreoffice.org/#/c/179/12/


but executing ...\program\python.exe does nothing.

hmm, will look at it.

May I ask somebody to check this gerrit-patch on MacOsX? Or may be it 
would be simplier to send a file-patch or create a feature branch?

Just let me know.

Thanks
David
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice] [GSoC 2012][svg export filter] Weekly Report #3

[Marco Cecchetti]

On Tue, 12 Jun 2012 19:40:55 +0200, Thorsten Behrens
 wrote:


Marco Cecchetti wrote:

Report #3
-
On this week I enabled support for clip-based slide and shape
transitions. The following transitions are actually available:
barnWipe, fourBoxWipe, ellipseWipe, pinWheelWipe. More clip-based
transitions can be provided by simply fill in the transition
parameters. I provided basic support for reverse method by
subtraction, too.


Hi Marco,

hats off - excellent progress, and very much in line with your
project plan. I've uploaded the two demo shows to

 http://users.freedesktop.org/~thorsten/gsoc-2012/shape_transitions-week3/

and

 http://users.freedesktop.org/~thorsten/gsoc-2012/slide_transitions-week3/

for easier trying, will do a quick blog update about it in a bit.


Hi Thorsten,
thanks for making the presentation samples easier to try.


Tiniest possible nit: no need to create OUStrings via this B2UCONST
macro anymore, OUString now has cstring-ctor & comparison (i.e. a
simple rtl::OUString aStr("myStr") will do now). :)


Good news, I was not aware of that. :)

Cheers,
-- Marco



--
Using Opera's revolutionary e-mail client: http://www.opera.com/mail/
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [PUSHED][PATCH] fdo 50822 add formula XOR to calc as in ODFF1.2

[Eike Rathke]

Hi,

On Tuesday, 2012-06-12 23:03:10 +0200, Eike Rathke wrote:

> So, we got this in:
> http://cgit.freedesktop.org/libreoffice/core/commit/?id=033cce3e0fbb72a9400836923be96c5036aaacb0

... marking thread as pushed ...

  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3  9E96 2F1A D073 293C 05FD


pgpkacEsfuiBl.pgp
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: OpenGrok Search Upon Link Click

[Philipp Riemer]

2012/6/12 Joel Madero :
> Hi All,
> Wondering if the behavior of opengrok is what is expected. My issue is that
> when I click on a variable name it takes me to the search page of opengrok
> and puts in the name as the description instead of as a full search. This
> rarely (actually never) comes up with anything. For instance if I do a
> regular full search as: validate between, it comes up with a list, I go into
> validate.src, then I click on SC_VALIDDLG_DATA_BETWEEN and it will
> place SC_VALIDDLG_DATA_BETWEEN in the description of a search, clicking
> search comes up with no results. Seems like it would be much more functional
> for the link to place the object name in the full search line.
>
> Just thinking out loud.
>
>
> Joel

Since it is code related the "symbol" search field might be a better
place for such links. This e.g. is the behaviour when clicking on a
function name (violet instead of green text) in opengrok source view.

Hopefully this is easily reconfigurable in opengrok's options...

Just my two cents...
Philipp
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: OpenGrok Search Upon Link Click

[Daniel Bankston]

On 06/12/2012 03:23 PM, Joel Madero wrote:

Hi All,
Wondering if the behavior of opengrok is what is expected. My issue is 
that when I click on a variable name it takes me to the search page of 
opengrok and puts in the name as the description instead of as a full 
search. This rarely (actually never) comes up with anything. For 
instance if I do a regular full search as: validate between, it comes 
up with a list, I go into validate.src, then I click on 
SC_VALIDDLG_DATA_BETWEEN 
 and 
it will place SC_VALIDDLG_DATA_BETWEEN 
 in 
the description of a search, clicking search comes up with no results. 
Seems like it would be much more functional for the link to place the 
object name in the full search line.


Just thinking out loud.


Joel


Hi, Joel,

That way never works for me, so I don't use it.
My experience was that it took some getting used to, to effectively use 
opengrok, and I'm sure there's still things I could learn.  Make sure 
you read the help page http://opengrok.libreoffice.org/help.jsp.


For what you are wanting to do to since you know a specific symbol name, 
I would recommend, for example, typing SC_VALIDDLG_DATA_BETWEEN into the 
Symbol search box if you want to see places it is used.  (The Definition 
and Symbol search boxes are case sensitive.)  If you want to limit the 
directories that are searched, for example sc, type in sc in the File 
Path search box in conjunction with the above.  (core/sc more 
specifically, but just sc seems to work.)



--Daniel
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [PATCH] fdo 50822 add formula XOR to calc as in ODFF1.2

[Eike Rathke]

Hi Winfried,

On Saturday, 2012-06-09 12:54:27 +0200, Winfried Donkers wrote:

> Attached is the modified patch for function XOR, this time under its own bug.

Thanks, works!

> I tested the patch, did an export to xls, reread the xls (XOR calls were not 
> recgnised/calculated when importing),

There's also saFuncTable_Odf in sc/source/filter/excel/xlformula.cxx
that still had the ocNoName opcode assigned, that table is used during
binary import. Changing the opcode to ocXor solved that.

> saved again as ods and reread that one (XOR calls were calculated correctly).
> I think this has to do with XOR being in saFuncTableOdf[] (in 
> core/sc/source/filter/oox/formulabase.cxx), which has the description 
> "Functions defined by OpenFormula, but not supported by Calc or by Excel." 
> and where XOR _is_ supported by Calc.

Well, that table is inclusive OR ;-)  not present in one or the other..
The tricky part is that functions of those aFuncTableOdf entries can be
read anyway even if not supported, just may map to an "unknown macro".

I also removed the leftover entry from saFuncTableBiff5.

> Subject: [PATCH] fdo#50822 add function XOR to calc as in ODFF1.2

um.. yeah, typo in bug number so the commits were assigned to the wrong
bug.. manually added to fdo#50882

So, we got this in:
http://cgit.freedesktop.org/libreoffice/core/commit/?id=033cce3e0fbb72a9400836923be96c5036aaacb0

For my changes see
http://cgit.freedesktop.org/libreoffice/core/commit/?id=9ae96127e5b363e6eea14a0e9459b22f0f7307ca

Thanks
  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3  9E96 2F1A D073 293C 05FD


pgpDjlkJ7vRrO.pgp
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: Branch 'feature/cmclayout' - sfx2/inc sfx2/source

[Caolán McNamara]

 sfx2/inc/sfx2/tabdlg.hxx  |   42 +-
 sfx2/source/dialog/tabdlg.cxx |  169 ++
 2 files changed, 111 insertions(+), 100 deletions(-)

New commits:
commit ce76e4befd731e047698c80409be28cea8b13bd5
Author: Caolán McNamara 
Date:   Tue Jun 12 21:54:57 2012 +0100

dynamically create SfxTabDialog widgets

so we can easily implement creating them vs reusing builder-provided
ones.

diff --git a/sfx2/inc/sfx2/tabdlg.hxx b/sfx2/inc/sfx2/tabdlg.hxx
index 324e9d7..520757c 100644
--- a/sfx2/inc/sfx2/tabdlg.hxx
+++ b/sfx2/inc/sfx2/tabdlg.hxx
@@ -75,17 +75,17 @@ friend class SfxTabDialogController;
 
 SfxViewFrame*   pFrame;
 
-VclVBox vbox;
-VclVBox content_area;
-TabControl aTabCtrl;
-
-VclHButtonBox action_area;
-OKButton aOKBtn;
-PushButton* pUserBtn;
-CancelButton aCancelBtn;
-HelpButton aHelpBtn;
-PushButton aResetBtn;
-PushButton aBaseFmtBtn;
+VclVBox *m_pVBox;
+VclVBox *m_pContentArea;
+TabControl *m_pTabCtrl;
+
+VclHButtonBox *m_pActionArea;
+OKButton *m_pOKBtn;
+PushButton* m_pUserBtn;
+CancelButton* m_pCancelBtn;
+HelpButton* m_pHelpBtn;
+PushButton* m_pResetBtn;
+PushButton* m_pBaseFmtBtn;
 
 const SfxItemSet*   pSet;
 SfxItemSet* pOutSet;
@@ -103,7 +103,7 @@ friend class SfxTabDialogController;
 DECL_DLLPRIVATE_LINK(BaseFmtHdl, void *);
 DECL_DLLPRIVATE_LINK(UserHdl, void *);
 DECL_DLLPRIVATE_LINK(CancelHdl, void *);
-SAL_DLLPRIVATE void Init_Impl(sal_Bool, const String *);
+SAL_DLLPRIVATE void Init_Impl( sal_Bool bFmtFlag, const String* 
pUserButtonText, const ResId& rResId );
 
 protected:
 virtual short   Ok();
@@ -164,7 +164,7 @@ public:
 
 voidSetCurPageId( sal_uInt16 nId ) { nAppPageId = nId; }
 sal_uInt16  GetCurPageId() const
-{ return aTabCtrl.GetCurPageId(); }
+{ return m_pTabCtrl->GetCurPageId(); }
 voidShowPage( sal_uInt16 nId );
 
 // may provide local slots converted by Map
@@ -173,15 +173,15 @@ public:
 const SfxItemSet*   GetOutputItemSet() const { return pOutSet; }
 sal_Bool IsFormat() const { return bFmt; }
 
-const OKButton& GetOKButton() const { return aOKBtn; }
-OKButton&   GetOKButton() { return aOKBtn; }
-const CancelButton& GetCancelButton() const { return aCancelBtn; }
-CancelButton&   GetCancelButton() { return aCancelBtn; }
-const HelpButton&   GetHelpButton() const { return aHelpBtn; }
-HelpButton& GetHelpButton() { return aHelpBtn; }
+const OKButton& GetOKButton() const { return *m_pOKBtn; }
+OKButton&   GetOKButton() { return *m_pOKBtn; }
+const CancelButton& GetCancelButton() const { return *m_pCancelBtn; }
+CancelButton&   GetCancelButton() { return *m_pCancelBtn; }
+const HelpButton&   GetHelpButton() const { return *m_pHelpBtn; }
+HelpButton& GetHelpButton() { return *m_pHelpBtn; }
 
-const PushButton*   GetUserButton() const { return pUserBtn; }
-PushButton* GetUserButton() { return pUserBtn; }
+const PushButton*   GetUserButton() const { return m_pUserBtn; }
+PushButton* GetUserButton() { return m_pUserBtn; }
 voidRemoveResetButton();
 
 short   Execute();
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index 33cb57f..f2eb399 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -146,10 +146,10 @@ void SfxTabDialogController::StateChanged( sal_uInt16 
/*nSID*/, SfxItemState /*e
 {
 pSet = pDialog->pSet = pSetItem->GetItemSet().Clone();
 sal_Bool bDialogStarted = sal_False;
-for ( sal_uInt16 n=0; naTabCtrl.GetPageCount(); n++ )
+for ( sal_uInt16 n=0; nm_pTabCtrl->GetPageCount(); n++ )
 {
-sal_uInt16 nPageId = pDialog->aTabCtrl.GetPageId( n );
-SfxTabPage* pTabPage = dynamic_cast 
(pDialog->aTabCtrl.GetTabPage( nPageId ));
+sal_uInt16 nPageId = pDialog->m_pTabCtrl->GetPageId( n );
+SfxTabPage* pTabPage = dynamic_cast 
(pDialog->m_pTabCtrl->GetTabPage( nPageId ));
 if ( pTabPage )
 {
 pTabPage->Reset( pSetItem->GetItemSet() );
@@ -393,19 +393,8 @@ void SfxTabPage::AddItemConnection( 
sfx::ItemConnectionBase* pConnection )
 }
 
 #define INI_LIST(ItemSetPtr) \
-  vbox(this, false, 7) \
-, content_area(&vbox) \
-, aTabCtrl(&content_area, ResId(ID_TABCONTROL,*rResId.GetResMgr())) \
-, action_area(&vbox) \
-, aOKBtn(&action_area) \
-, pUserBtn(pUserButtonText? new PushButton(&action_area): 0) \
-, aCancelBtn(&action_area) \
-, aHelpBtn(&action_area) \
-, aResetBtn(&action_area) \
-, aBaseFmtBtn(&action_area) \
-, pSet(ItemSetPtr) \
+  pSet(ItemSetPtr) \
 , pOutSet

[PATCH] - avoid a memset

[Marion & Christophe JAILLET]

Hi,

first try to send a patch for libreoffice,

Has nothing much is explained on 
http://www.libreoffice.org/developers-2/, please feel free to tell me 
how to improve my submissions.



This one, is to avoid a call to memset(..., 0, ...) for memory allocated 
with calloc.



Best regards
Christophe JAILLET

diff --git a/i18npool/source/breakiterator/breakiterator_ctl.cxx 
b/i18npool/source/breakiterator/breakiterator_ctl.cxx
index 70a3124..5d1d7a1 100644
--- a/i18npool/source/breakiterator/breakiterator_ctl.cxx
+++ b/i18npool/source/breakiterator/breakiterator_ctl.cxx
@@ -51,7 +51,6 @@ BreakIterator_CTL::BreakIterator_CTL() :
 // to improve performance, alloc big enough memory in construct.
 nextCellIndex = (sal_Int32*) calloc(cellIndexSize, sizeof(sal_Int32));
 previousCellIndex = (sal_Int32*) calloc(cellIndexSize, sizeof(sal_Int32));
-memset(nextCellIndex, 0, cellIndexSize * sizeof(sal_Int32));
 }
 
 /**
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sc/source

[Eike Rathke]

 sc/source/filter/excel/xlformula.cxx |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 9649bd88f43982c7232ad576997c78317f670d7e
Author: Eike Rathke 
Date:   Tue Jun 12 22:29:17 2012 +0200

accept BIT* functions as _xlfnodf.* in Excel import

BITAND, BITOR, BITXOR, BITRSHIFT, BITLSHIFT are written as _xlfnodf.* in 
Excel
export because Excel doesn't have them. So far we weren't able to properly
read that in again and the #MACRO? error was generated as function result.
(cherry picked from commit fa3c8f55f45476a23e9927cec585f84ef59a638b)

diff --git a/sc/source/filter/excel/xlformula.cxx 
b/sc/source/filter/excel/xlformula.cxx
index 29c0bb1..914f6c7 100644
--- a/sc/source/filter/excel/xlformula.cxx
+++ b/sc/source/filter/excel/xlformula.cxx
@@ -374,11 +374,11 @@ static const XclFunctionInfo saFuncTable_Odf[] =
 EXC_FUNCENTRY_ODF( ocArabic,1,  1,  0,  "ARABIC" ),
 EXC_FUNCENTRY_ODF( ocB, 3,  4,  0,  "B" ),
 EXC_FUNCENTRY_ODF( ocBase,  2,  3,  0,  "BASE" ),
-EXC_FUNCENTRY_ODF( ocNoName,2,  2,  0,  "BITAND" ),
-EXC_FUNCENTRY_ODF( ocNoName,2,  2,  0,  "BITLSHIFT" ),
-EXC_FUNCENTRY_ODF( ocNoName,2,  2,  0,  "BITOR" ),
-EXC_FUNCENTRY_ODF( ocNoName,2,  2,  0,  "BITRSHIFT" ),
-EXC_FUNCENTRY_ODF( ocNoName,2,  2,  0,  "BITXOR" ),
+EXC_FUNCENTRY_ODF( ocBitAnd,2,  2,  0,  "BITAND" ),
+EXC_FUNCENTRY_ODF( ocBitLshift, 2,  2,  0,  "BITLSHIFT" ),
+EXC_FUNCENTRY_ODF( ocBitOr, 2,  2,  0,  "BITOR" ),
+EXC_FUNCENTRY_ODF( ocBitRshift, 2,  2,  0,  "BITRSHIFT" ),
+EXC_FUNCENTRY_ODF( ocBitXor,2,  2,  0,  "BITXOR" ),
 EXC_FUNCENTRY_ODF( ocChiSqDist, 2,  3,  0,  "CHISQDIST" ),
 EXC_FUNCENTRY_ODF( ocChiSqInv,  2,  2,  0,  "CHISQINV" ),
 EXC_FUNCENTRY_ODF( ocKombin2,   2,  2,  0,  "COMBINA" ),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [PUSHED-3-5][PATCH-3-5-5] rhbz#678440: Always include User-Agent to avoid 403 from picky servers

[Fridrich Strba]

Cherry-picked to 3-5, we need two more people for the 3-5-5 branch.

F.

On 12/06/12 18:50, Stephan Bergmann wrote:
> It would be nice if
> 
> "rhbz#678440: Always include User-Agent to avoid 403 from picky servers"
> fixing  "opening
> urls fails with error 403 on picky servers" could be reviewed for
> inclusion into libreoffice-3-5 and libreoffice-3-5-5.  I consider the
> patch low-risk.
> 
> As the patch would not apply as-is to the 3.5 code line, find attached
> an adapted 0001-rhbz-678440-Always-include-User-Agent-to-avoid-403-f.patch.
> 
> Thanks,
> Stephan
> 
> 
> ___
> 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] .: Branch 'libreoffice-3-5' - ucb/source

[Fridrich Strba]

 ucb/source/ucp/webdav/DAVResourceAccess.cxx |   15 +++
 1 file changed, 15 insertions(+)

New commits:
commit 8dfbb8793407a103ef8c5fa109f0fdf15af9262b
Author: Stephan Bergmann 
Date:   Tue Jun 12 18:17:37 2012 +0200

rhbz#678440: Always include User-Agent to avoid 403 from picky servers

Change-Id: I4fa7b45062b0058427f77cf9dc0abebd6b26fb49
Signed-off-by: Fridrich Å trba 

diff --git a/ucb/source/ucp/webdav/DAVResourceAccess.cxx 
b/ucb/source/ucp/webdav/DAVResourceAccess.cxx
index 11b5251..e669245 100644
--- a/ucb/source/ucp/webdav/DAVResourceAccess.cxx
+++ b/ucb/source/ucp/webdav/DAVResourceAccess.cxx
@@ -1151,6 +1151,21 @@ void DAVResourceAccess::getUserRequestHeaders(
 }
 }
 }
+
+// Make sure a User-Agent header is always included, as at least
+// en.wikipedia.org:80 forces back 403 "Scripts should use an informative
+// User-Agent string with contact information, or they may be IP-blocked
+// without notice" otherwise:
+for ( DAVRequestHeaders::iterator i(rRequestHeaders.begin());
+  i != rRequestHeaders.end(); ++i )
+{
+if ( i->first.equalsIgnoreAsciiCase( "User-Agent" ) )
+{
+return;
+}
+}
+rRequestHeaders.push_back(
+DAVRequestHeader( "User-Agent", "LibreOffice" ) );
 }
 
 //=
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 3 commits - formula/inc formula/source sc/inc sc/qa sc/source sc/util

[Eike Rathke]

 formula/inc/formula/compiler.hrc   |5 -
 formula/inc/formula/opcode.hxx |1 
 formula/source/core/api/FormulaCompiler.cxx|1 
 formula/source/core/resource/core_resource.src |5 +
 sc/inc/helpids.h   |1 
 sc/qa/unit/ucalc.cxx   |1 
 sc/source/core/inc/interpre.hxx|1 
 sc/source/core/tool/interpr1.cxx   |  101 +
 sc/source/core/tool/interpr4.cxx   |1 
 sc/source/core/tool/parclass.cxx   |1 
 sc/source/filter/excel/xlformula.cxx   |   12 +-
 sc/source/ui/src/scfuncs.src   |   24 +
 sc/source/ui/vba/vbawsfunction.cxx |2 
 sc/util/hidother.src   |1 
 14 files changed, 148 insertions(+), 9 deletions(-)

New commits:
commit fa3c8f55f45476a23e9927cec585f84ef59a638b
Author: Eike Rathke 
Date:   Tue Jun 12 22:29:17 2012 +0200

accept BIT* functions as _xlfnodf.* in Excel import

BITAND, BITOR, BITXOR, BITRSHIFT, BITLSHIFT are written as _xlfnodf.* in 
Excel
export because Excel doesn't have them. So far we weren't able to properly
read that in again and the #MACRO? error was generated as function result.

diff --git a/sc/source/filter/excel/xlformula.cxx 
b/sc/source/filter/excel/xlformula.cxx
index 9a11412..d299aa2 100644
--- a/sc/source/filter/excel/xlformula.cxx
+++ b/sc/source/filter/excel/xlformula.cxx
@@ -374,11 +374,11 @@ static const XclFunctionInfo saFuncTable_Odf[] =
 EXC_FUNCENTRY_ODF( ocArabic,1,  1,  0,  "ARABIC" ),
 EXC_FUNCENTRY_ODF( ocB, 3,  4,  0,  "B" ),
 EXC_FUNCENTRY_ODF( ocBase,  2,  3,  0,  "BASE" ),
-EXC_FUNCENTRY_ODF( ocNoName,2,  2,  0,  "BITAND" ),
-EXC_FUNCENTRY_ODF( ocNoName,2,  2,  0,  "BITLSHIFT" ),
-EXC_FUNCENTRY_ODF( ocNoName,2,  2,  0,  "BITOR" ),
-EXC_FUNCENTRY_ODF( ocNoName,2,  2,  0,  "BITRSHIFT" ),
-EXC_FUNCENTRY_ODF( ocNoName,2,  2,  0,  "BITXOR" ),
+EXC_FUNCENTRY_ODF( ocBitAnd,2,  2,  0,  "BITAND" ),
+EXC_FUNCENTRY_ODF( ocBitLshift, 2,  2,  0,  "BITLSHIFT" ),
+EXC_FUNCENTRY_ODF( ocBitOr, 2,  2,  0,  "BITOR" ),
+EXC_FUNCENTRY_ODF( ocBitRshift, 2,  2,  0,  "BITRSHIFT" ),
+EXC_FUNCENTRY_ODF( ocBitXor,2,  2,  0,  "BITXOR" ),
 EXC_FUNCENTRY_ODF( ocChiSqDist, 2,  3,  0,  "CHISQDIST" ),
 EXC_FUNCENTRY_ODF( ocChiSqInv,  2,  2,  0,  "CHISQINV" ),
 EXC_FUNCENTRY_ODF( ocKombin2,   2,  2,  0,  "COMBINA" ),
commit 9ae96127e5b363e6eea14a0e9459b22f0f7307ca
Author: Eike Rathke 
Date:   Tue Jun 12 22:09:07 2012 +0200

changes to patch "fdo#50822 add function XOR to calc as in ODFF1.2"

* removed XOR entry again from sc/source/filter/oox/formulabase.cxx
  saFuncTableBiff5
* changed XOR entry in sc/source/filter/excel/xlformula.cxx saFuncTable_Odf
  from ocNoName to ocXor to have it written as _xlfnodf.XOR
* changed description of function in Function Wizard

diff --git a/sc/source/filter/excel/xlformula.cxx 
b/sc/source/filter/excel/xlformula.cxx
index 4af76f0..9a11412 100644
--- a/sc/source/filter/excel/xlformula.cxx
+++ b/sc/source/filter/excel/xlformula.cxx
@@ -403,7 +403,7 @@ static const XclFunctionInfo saFuncTable_Odf[] =
 EXC_FUNCENTRY_ODF( ocNoName,1,  MX, 0,  "SKEWP" ),
 EXC_FUNCENTRY_ODF( ocUnichar,   1,  1,  0,  "UNICHAR" ),
 EXC_FUNCENTRY_ODF( ocUnicode,   1,  1,  0,  "UNICODE" ),
-EXC_FUNCENTRY_ODF( ocNoName,1,  MX, 0,  "XOR" )
+EXC_FUNCENTRY_ODF( ocXor,   1,  MX, 0,  "XOR" )
 };
 
 #undef EXC_FUNCENTRY_ODF
diff --git a/sc/source/filter/oox/formulabase.cxx 
b/sc/source/filter/oox/formulabase.cxx
index 381d74d..b80dbfa 100644
--- a/sc/source/filter/oox/formulabase.cxx
+++ b/sc/source/filter/oox/formulabase.cxx
@@ -669,7 +669,6 @@ static const FunctionData saFuncTableBiff5[] =
 { 0,"DATESTRING",   352,352,1,  1, 
 V, { VR }, FUNCFLAG_IMPORTONLY },   // not supported in Calc, missing in OOXML 
spec
 { 0,"NUMBERSTRING", 353,353,2,  2, 
 V, { VR }, FUNCFLAG_IMPORTONLY },   // not supported in Calc, missing in OOXML 
spec
 { "ROMAN",  "ROMAN",354,354,1,  2, 
 V, { VR }, 0 },
-{ "XOR","XOR",  355,355,1,  
MX, V, { RX }, 0 },
 
 // *** EuroTool add-in ***
 
diff --git a/sc/source/ui/src/scfuncs.src b/sc/source/ui/src/scfuncs.src
index 60f8fca..039aad6 100644
--- a/sc/source/ui/src/scfuncs.src
+++ b/sc/source/ui/src/scfuncs.src
@@ -2687,7 +2687,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
 {
 String 1 // Description
 {
-Text [ en-US ] = "Returns TRUE if one argument is TRUE, but not 
both." ;
+Text [ en-US ] = "Returns TRUE if an odd nu

[Libreoffice-commits] .: salhelper/inc

[Caolán McNamara]

 salhelper/inc/salhelper/dynload.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a741932eb4e83148a341cfd5c6a30ff1878e3149
Author: Caolán McNamara 
Date:   Tue Jun 12 21:26:04 2012 +0100

fucntion -> function

Change-Id: I0d345b2cf60f49e0e6b72724251c1f6d30529dce

diff --git a/salhelper/inc/salhelper/dynload.hxx 
b/salhelper/inc/salhelper/dynload.hxx
index 66bf6b2..5f3e98e 100644
--- a/salhelper/inc/salhelper/dynload.hxx
+++ b/salhelper/inc/salhelper/dynload.hxx
@@ -42,7 +42,7 @@ namespace salhelper
 class SALHELPER_DLLPUBLIC ORealDynamicLoader
 {
 public:
-/** initializes the loader, loads the library and call the initialization 
fucntion.
+/** initializes the loader, loads the library and call the initialization 
function.
 
 @param ppSetToZeroInDestructor points to the loader instance which 
must be set to NULL
if the loader will be destroyed.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Recent commits on sc/source/ui/condformat/condformatdlg.cxx

[Daniel Bankston]

Hi, Stephan,

I just happened to notice that your commit 
http://cgit.freedesktop.org/libreoffice/core/commit/?id=1c18604836ce8063b80cc8090445bf0c0094c5d8 
undid part of Markus's commit 
http://cgit.freedesktop.org/libreoffice/core/commit/?id=56de6cce83701f003416ad91b28c0dbca3a3d67e 
.  I think perhaps this was a work in progress for Markus?  I just 
wanted to bring it to both of your attention to avoid unnecessary 
problems and confusion.  Then again maybe you have already communicated 
about it?


Respectfully,
Daniel Bankston
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

OpenGrok Search Upon Link Click

[Joel Madero]

Hi All,
Wondering if the behavior of opengrok is what is expected. My issue is that
when I click on a variable name it takes me to the search page of opengrok
and puts in the name as the description instead of as a full search. This
rarely (actually never) comes up with anything. For instance if I do a
regular full search as: validate between, it comes up with a list, I go
into validate.src, then I click on
SC_VALIDDLG_DATA_BETWEEN
and
it will place 
SC_VALIDDLG_DATA_BETWEEN
in
the description of a search, clicking search comes up with no results.
Seems like it would be much more functional for the link to place the
object name in the full search line.

Just thinking out loud.


Joel
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - instsetoo_native/inc_ooohelppack instsetoo_native/inc_ooolangpack instsetoo_native/inc_openoffice scp2/source setup_native/source

[Andras Timar]

 instsetoo_native/inc_ooohelppack/windows/msi_templates/CustomAc.idt
  |1 
 instsetoo_native/inc_ooohelppack/windows/msi_templates/InstallE.idt
  |1 
 instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt
  |1 
 instsetoo_native/inc_ooolangpack/windows/msi_templates/CustomAc.idt
  |1 
 instsetoo_native/inc_ooolangpack/windows/msi_templates/InstallE.idt
  |1 
 instsetoo_native/inc_ooolangpack/windows/msi_templates/Property.idt
  |1 
 instsetoo_native/inc_openoffice/windows/msi_languages/CustomAc.ulf 
  |3 
 instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt 
  |1 
 instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt 
  |1 
 instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt 
  |1 
 scp2/source/ooo/windowscustomaction_ooo.scp
  |   30 --
 
setup_native/source/win32/customactions/languagepacks/checkrunningofficelanguagepack.cxx
 |  150 --
 setup_native/source/win32/customactions/languagepacks/exports.dxp  
  |1 
 setup_native/source/win32/customactions/languagepacks/makefile.mk  
  |3 
 setup_native/source/win32/customactions/patch/exports.dxp  
  |1 
 setup_native/source/win32/customactions/patch/swappatchfiles.cxx   
  |   40 --
 setup_native/source/win32/customactions/shellextensions/checkrunningoffice.cxx 
  |  135 -
 setup_native/source/win32/customactions/shellextensions/exports.dxp
  |1 
 setup_native/source/win32/customactions/shellextensions/makefile.mk
  |1 
 19 files changed, 2 insertions(+), 372 deletions(-)

New commits:
commit 44428bf195b6ccea840fcf4f28c004ca9858d078
Author: Andras Timar 
Date:   Tue Jun 12 22:04:04 2012 +0200

delete problematic IsOfficeRunning custom action

Change-Id: Id68521b92f572366a68f35c09387a7ed45a835ff

diff --git 
a/instsetoo_native/inc_ooohelppack/windows/msi_templates/CustomAc.idt 
b/instsetoo_native/inc_ooohelppack/windows/msi_templates/CustomAc.idt
index 7af1c7b..997515a 100644
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/CustomAc.idt
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/CustomAc.idt
@@ -7,4 +7,3 @@ setUserProfileNT51  USERPROFILE [%USERPROFILE]
 SetARPInstallLocation  51  ARPINSTALLLOCATION  [INSTALLLOCATION]
 NewProductFound19  OOO_CUSTOMACTION_1
 SameProductFound   19  OOO_CUSTOMACTION_2
-RunningOffice  19  OOO_CUSTOMACTION_4
diff --git 
a/instsetoo_native/inc_ooohelppack/windows/msi_templates/InstallE.idt 
b/instsetoo_native/inc_ooohelppack/windows/msi_templates/InstallE.idt
index 90ba9c6..7d22ecb 100644
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/InstallE.idt
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/InstallE.idt
@@ -49,7 +49,6 @@ RemoveIniValues   1550
 RemoveODBC 1200
 RemoveRegistryValues   1300
 RemoveShortcuts1600
-RunningOffice  OFFICERUNS="1"  135
 RMCCPSearchNot CCP_SUCCESS And CCP_TEST250
 SameProductFound   SAMEPRODUCTS120
 ScheduleReboot ISSCHEDULEREBOOT3125
diff --git 
a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt 
b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt
index 0f3ed1e..a4b5edc 100644
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt
@@ -28,7 +28,6 @@ ISSCRIPT_VERSION_MISSING  IDS_ISSCRIPT_VERSION_MISSING
 ISSCRIPT_VERSION_OLD   IDS_ISSCRIPT_VERSION_OLD
 ISVROOT_PORT_NO0
 Manufacturer   MANUFACTURERTEMPLATE
-OFFICERUNS 0
 PIDTemplate12345<###-%%%>@
 ProductCodePRODUCTCODETEMPLATE
 ProductID  none
diff --git 
a/instsetoo_native/inc_ooolangpack/windows/msi_templates/CustomAc.idt 
b/instsetoo_native/inc_ooolangpack/windows/msi_templates/CustomAc.idt
index 7af1c7b..997515a 100644
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/CustomAc.idt
+++ b/instsetoo_native/inc_ooolangpack/windows/msi_templates/CustomAc.idt
@@ -7,4 +7,3 @@ setUserProfileNT51  USERPROFILE [%USERPROFILE]
 SetARPInstallLocation  51  ARPINSTALLLOCATION  [INSTALLLOCATION]
 NewProductFound19  OOO_CUSTOMACTION_1
 SameProductFound   19  OOO_CUSTOMACTION_2
-RunningOffice  19  OOO_CUSTOMACTION_4
diff --git 
a/instsetoo_native/inc_ooolangpack/windows/msi_templates/InstallE.idt 
b/instsetoo_native/inc_ooolangpack/windows/msi_templates/InstallE.idt
index 90ba9c6..7d22ecb 100644
--- a/instset

% Help to make install...

[ORTIZ MARTINEZ JOSE ASUNCION]

Hi Everbody ¡!

Yesterday,  I finally have the ' build libre office (3.5.0.3 version)'  done .
( windows 7, cwin, 3.5.0.3 version and the next options in the autogen.lastrun
--disable-build-mozilla
--disable-odk
--with-mozilla-build=/cygdrive/c/mb
--with-windows-sdk-home=/cygdrive/c/software/Microsoft SDKs/Windows/v7.1
--with-ant-home=/cygdrive/c/anth
--without-junit
--disable-atl
--disable-activex
--with-csc-path=/cygdrive/c/csc
)

The last message was :

:  : :
LibreOffice build succesfully finished.

To install, issue: make install
Developers might prefer this way: make dev-install -o build
   :  : :
-

But  When I try to install with :make install

I have the next error  :

:  : :

echo "Installing in /usr/local/lib/libreoffice..." && \
ooinstall "/usr/local/lib/libreoffice" && \
echo "" && \
echo "Installation finished, you can now execute:" && \
echo "/usr/local/lib/libreoffice/program/soffice"
Installing in /usr/local/lib/libreoffice...
: No such file or directory at /cygdrive/c/libo/solenv/bin/ooinstall line 52
/cygdrive/c/libo/solenv/gbuild/extensions/post_AuxTargets.mk:87: recipe for 
target `install' failed
make[1]: *** [install] Error 9
make[1]: se sale del directorio `/cygdrive/c/libo'
/cygdrive/c/libo/solenv/gbuild/source_and_rerun.mk:23: recipe for target 
`source-env-and-recurse' failed
make: *** [source-env-and-recurse] Error 2


Any idea to solve this error ?   It looks related to phyton and the config.mk  
..

Thanks for your help  ..


___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Source for 3.3

[Joel Madero]

Looks perfect, thank you much

Joel

On Tue, Jun 12, 2012 at 1:05 PM, Daniel Bankston <
daniel.dev.libreoff...@gmail.com> wrote:

>  On 06/12/2012 02:59 PM, Joel Madero wrote:
>
> Hi All,
>
>  Trying to tackle a bug reported by a user that they say was a regression
> from 3.3. I'm trying to get my hands on the source for 3.3 so I can do a
> comparison of the appropriate code. Can someone link me, thanks!
>
>
>  Joel
>
>  Hi, Joel,
>
> Check this out: http://cgit.freedesktop.org/libreoffice/core/refs/tags.
>
>
> Respectfully,
> Daniel Bankston
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: instsetoo_native/inc_ooohelppack instsetoo_native/inc_ooolangpack instsetoo_native/inc_openoffice scp2/source setup_native/source

[Andras Timar]

 instsetoo_native/inc_ooohelppack/windows/msi_templates/CustomAc.idt
  |1 
 instsetoo_native/inc_ooohelppack/windows/msi_templates/InstallE.idt
  |1 
 instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt
  |1 
 instsetoo_native/inc_ooolangpack/windows/msi_templates/CustomAc.idt
  |1 
 instsetoo_native/inc_ooolangpack/windows/msi_templates/InstallE.idt
  |1 
 instsetoo_native/inc_ooolangpack/windows/msi_templates/Property.idt
  |1 
 instsetoo_native/inc_openoffice/windows/msi_languages/CustomAc.ulf 
  |3 
 instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt 
  |1 
 instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt 
  |1 
 instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt 
  |1 
 scp2/source/ooo/windowscustomaction_ooo.scp
  |   30 --
 
setup_native/source/win32/customactions/languagepacks/checkrunningofficelanguagepack.cxx
 |  150 --
 setup_native/source/win32/customactions/languagepacks/exports.dxp  
  |1 
 setup_native/source/win32/customactions/languagepacks/makefile.mk  
  |3 
 setup_native/source/win32/customactions/patch/exports.dxp  
  |1 
 setup_native/source/win32/customactions/patch/swappatchfiles.cxx   
  |   40 --
 setup_native/source/win32/customactions/shellextensions/checkrunningoffice.cxx 
  |  135 -
 setup_native/source/win32/customactions/shellextensions/exports.dxp
  |1 
 setup_native/source/win32/customactions/shellextensions/makefile.mk
  |1 
 19 files changed, 2 insertions(+), 372 deletions(-)

New commits:
commit 1505ba77d8051dbcf1ff681c55031ea2f6a1b83b
Author: Andras Timar 
Date:   Tue Jun 12 22:04:04 2012 +0200

delete problematic IsOfficeRunning custom action

Change-Id: Id68521b92f572366a68f35c09387a7ed45a835ff

diff --git 
a/instsetoo_native/inc_ooohelppack/windows/msi_templates/CustomAc.idt 
b/instsetoo_native/inc_ooohelppack/windows/msi_templates/CustomAc.idt
index 7af1c7b..997515a 100644
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/CustomAc.idt
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/CustomAc.idt
@@ -7,4 +7,3 @@ setUserProfileNT51  USERPROFILE [%USERPROFILE]
 SetARPInstallLocation  51  ARPINSTALLLOCATION  [INSTALLLOCATION]
 NewProductFound19  OOO_CUSTOMACTION_1
 SameProductFound   19  OOO_CUSTOMACTION_2
-RunningOffice  19  OOO_CUSTOMACTION_4
diff --git 
a/instsetoo_native/inc_ooohelppack/windows/msi_templates/InstallE.idt 
b/instsetoo_native/inc_ooohelppack/windows/msi_templates/InstallE.idt
index 90ba9c6..7d22ecb 100644
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/InstallE.idt
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/InstallE.idt
@@ -49,7 +49,6 @@ RemoveIniValues   1550
 RemoveODBC 1200
 RemoveRegistryValues   1300
 RemoveShortcuts1600
-RunningOffice  OFFICERUNS="1"  135
 RMCCPSearchNot CCP_SUCCESS And CCP_TEST250
 SameProductFound   SAMEPRODUCTS120
 ScheduleReboot ISSCHEDULEREBOOT3125
diff --git 
a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt 
b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt
index 0f3ed1e..a4b5edc 100644
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt
@@ -28,7 +28,6 @@ ISSCRIPT_VERSION_MISSING  IDS_ISSCRIPT_VERSION_MISSING
 ISSCRIPT_VERSION_OLD   IDS_ISSCRIPT_VERSION_OLD
 ISVROOT_PORT_NO0
 Manufacturer   MANUFACTURERTEMPLATE
-OFFICERUNS 0
 PIDTemplate12345<###-%%%>@
 ProductCodePRODUCTCODETEMPLATE
 ProductID  none
diff --git 
a/instsetoo_native/inc_ooolangpack/windows/msi_templates/CustomAc.idt 
b/instsetoo_native/inc_ooolangpack/windows/msi_templates/CustomAc.idt
index 7af1c7b..997515a 100644
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/CustomAc.idt
+++ b/instsetoo_native/inc_ooolangpack/windows/msi_templates/CustomAc.idt
@@ -7,4 +7,3 @@ setUserProfileNT51  USERPROFILE [%USERPROFILE]
 SetARPInstallLocation  51  ARPINSTALLLOCATION  [INSTALLLOCATION]
 NewProductFound19  OOO_CUSTOMACTION_1
 SameProductFound   19  OOO_CUSTOMACTION_2
-RunningOffice  19  OOO_CUSTOMACTION_4
diff --git 
a/instsetoo_native/inc_ooolangpack/windows/msi_templates/InstallE.idt 
b/instsetoo_native/inc_ooolangpack/windows/msi_templates/InstallE.idt
index 90ba9c6..7d22ecb 100644
--- a/instset

Re: Source for 3.3

[Daniel Bankston]

On 06/12/2012 02:59 PM, Joel Madero wrote:

Hi All,

Trying to tackle a bug reported by a user that they say was a 
regression from 3.3. I'm trying to get my hands on the source for 3.3 
so I can do a comparison of the appropriate code. Can someone link me, 
thanks!



Joel


Hi, Joel,

Check this out: http://cgit.freedesktop.org/libreoffice/core/refs/tags.


Respectfully,
Daniel Bankston
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

IsOfficeRunning() (was: [tdf-core] I'm sure this is an accident...)

[Andras Timar]

2012.06.11. 12:13 keltezéssel, Jesús Corrius írta:

That's right, first we shutdown our own Quickstarter, then we look for a
running soffice.bin process, which can belong to AOO as well. So rather the
IsOfficeRunning() should be amended, so we only check for running
LibreOffice and ignore others (I hope it is OK but I'm not sure).


Exactly we can keep the AOO process running anyway as we don't overwrite it.

So:

1. Enumerate windows with current class ID
2. Get the path of the image. If it's our installation path, we kill it.
3. If is not our installation path, the installation can continue.

Which in fact this is what the shutdown_quickstart MSI plugin does.

If IsOfficeRunning() doesn't check for the class ID  (not nice) we
just make sure that the image path of the running process is the one
we are going to overwrite.



After some research I found that IsOfficeRunning() is completely 
useless. At least in main installer. It checks if (Libre)Office is 
running, and if it is, installer aborts. Originally it tried to rename a 
file in the installation folder with user privileges - instant fail on 
Vista and Windows 7. Now it checks if soffice.bin is running. However, 
soffice.bin can belong to AOO, Symphony etc. that we have no business 
with. We could fix IsOfficeRunning() so it detects LibreOffice only. But 
why bother? Installer will not let overwrite files in use anyway. It 
will display a dialog that user installer needs to update files in use, 
and it will list the affected processes. It is more reliable, than 
IsOfficeRunning(). If user ignores the files in use warning, no problem, 
things will get sorted out after a restart.


My proposal is to remove IsOfficeRunning custom action from installer, 
and delete it from source code. Does anybody know why it was developed 
in the first place?


Andras


___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

IsOfficeRunning() (was: [tdf-core] I'm sure this is an accident...)

[Andras Timar]

2012.06.11. 12:13 keltezéssel, Jesús Corrius írta:

That's right, first we shutdown our own Quickstarter, then we look for a
running soffice.bin process, which can belong to AOO as well. So rather the
IsOfficeRunning() should be amended, so we only check for running
LibreOffice and ignore others (I hope it is OK but I'm not sure).


Exactly we can keep the AOO process running anyway as we don't overwrite it.

So:

1. Enumerate windows with current class ID
2. Get the path of the image. If it's our installation path, we kill it.
3. If is not our installation path, the installation can continue.

Which in fact this is what the shutdown_quickstart MSI plugin does.

If IsOfficeRunning() doesn't check for the class ID  (not nice) we
just make sure that the image path of the running process is the one
we are going to overwrite.



After some research I found that IsOfficeRunning() is completely 
useless. At least in main installer. It checks if (Libre)Office is 
running, and if it is, installer aborts. Originally it tried to rename a 
file in the installation folder with user privileges - instant fail on 
Vista and Windows 7. Now it checks if soffice.bin is running. However, 
soffice.bin can belong to AOO, Symphony etc. that we have no business 
with. We could fix IsOfficeRunning() so it detects LibreOffice only. But 
why bother? Installer will not let overwrite files in use anyway. It 
will display a dialog that user installer needs to update files in use, 
and it will list the affected processes. It is more reliable, than 
IsOfficeRunning(). If user ignores the files in use warning, no problem, 
things will get sorted out after a restart.


My proposal is to remove IsOfficeRunning custom action from installer, 
and delete it from source code. Does anybody know why it was developed 
in the first place?


Andras


___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: sc/source

[Stephan Bergmann]

 sc/source/ui/condformat/condformatdlg.cxx |   30 --
 1 file changed, 30 deletions(-)

New commits:
commit 1c18604836ce8063b80cc8090445bf0c0094c5d8
Author: Stephan Bergmann 
Date:   Tue Jun 12 22:00:40 2012 +0200

-Werror,-Wunused-function

Change-Id: I1b12a923e8c045c7ebca8c0b77b8135d3e072ac9

diff --git a/sc/source/ui/condformat/condformatdlg.cxx 
b/sc/source/ui/condformat/condformatdlg.cxx
index 81a681b..8434d53 100644
--- a/sc/source/ui/condformat/condformatdlg.cxx
+++ b/sc/source/ui/condformat/condformatdlg.cxx
@@ -709,36 +709,6 @@ ScColorScaleEntry* createColorScaleEntry( const ListBox& 
rType, const ColorListB
 return pEntry;
 }
 
-void GetDataBarType(const ListBox& rLstBox, const Edit& rEd, 
ScColorScaleEntry* pEntry )
-{
-double nVal = 0;
-switch(rLstBox.GetSelectEntryPos())
-{
-case 0:
-pEntry->SetMin(true);
-break;
-case 1:
-pEntry->SetMax(true);
-break;
-case 2:
-pEntry->SetPercentile(true);
-nVal = rtl::math::stringToDouble(rEd.GetText(), '.', ',');
-pEntry->SetValue(nVal);
-break;
-case 3:
-nVal = rtl::math::stringToDouble(rEd.GetText(), '.', ',');
-pEntry->SetPercent(true);
-pEntry->SetValue(nVal);
-break;
-case 4:
-nVal = rtl::math::stringToDouble(rEd.GetText(), '.', ',');
-pEntry->SetValue(nVal);
-break;
-case 5:
-break;
-}
-}
-
 }
 
 ScFormatEntry* ScCondFrmtEntry::createColorscaleEntry() const
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Source for 3.3

[Joel Madero]

Hi All,

Trying to tackle a bug reported by a user that they say was a regression
from 3.3. I'm trying to get my hands on the source for 3.3 so I can do a
comparison of the appropriate code. Can someone link me, thanks!


Joel
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: probabilistic approach to tinderboxing

[Bjoern Michaelsen]

On Tue, Jun 12, 2012 at 04:45:06PM +0200, Bjoern Michaelsen wrote:
> After sending off the tinderbox with this patchset, do:
>p-innocent(patch) *= p-innocent(testcase)
> reducing the innocence of the patches without waiting for results. So we 
> assume
> the patches of the set to be partially guilty until proven innocent.

On a second thought that should actually be:
p-innocent(patch) *= (number of patches in patchset-1)/(number of patches 
in patchset)

Best,

Bjoern
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 2 commits - bin/lo-commit-stat

[Petr Mladek]

 bin/lo-commit-stat |   38 --
 1 file changed, 32 insertions(+), 6 deletions(-)

New commits:
commit eeeffb9a9d8e1a84d2d85a13ea84e9d00aed3e58
Author: Petr Mladek 
Date:   Tue Jun 12 19:46:42 2012 +0200

lo-commit-stat: avoid problems whit '%' in the commit message

Change-Id: Ia10bac649cc078f6ef39002d280dcff7e5d0b06d

diff --git a/bin/lo-commit-stat b/bin/lo-commit-stat
index 310548e..1a8e6bb 100755
--- a/bin/lo-commit-stat
+++ b/bin/lo-commit-stat
@@ -80,6 +80,9 @@ sub standardize_summary($)
 my $first_char = lc($1);
 $line =~ s/^./$first_char/;
 }
+# print does not like 0% or so
+$line =~ s/%/%%/g;
+
 
 # FIXME: remove do at the end of line
 #remove bug numbers
commit 0fb4d677b32d944c8796d71ae95a7f41cc47e16c
Author: Thorsten Behrens 
Date:   Tue Jun 12 03:34:33 2012 +0200

Optionally output wiki-markup from lo-commit-stat

Starts to be a bit annoying to roll shell-sed every release.
We fix too many bugs.

Change-Id: I34b0e9c2bf2c43f84abd555a9d2ac7dde0b6ba3a
Signed-off-by: Petr Mladek 

diff --git a/bin/lo-commit-stat b/bin/lo-commit-stat
index 0697432..310548e 100755
--- a/bin/lo-commit-stat
+++ b/bin/lo-commit-stat
@@ -25,11 +25,16 @@ sub search_bugs()
 my $bug_orig;
 while (defined $bug) {
 
-# match fdo#123, rhz#123, i#123
+# match fdo#123, rhz#123, i#123, #123
 # but match only bug number with >= 4 digits
-if ( $line =~ m/(\w*\#+\d{4,})/ ) {
+if ( $line =~ m/(\w+\#+\d{4,})/ ) {
 $bug_orig = $1;
 $bug = $1;
+   # default to issuezilla for the #123 variant
+# but match only bug number with >= 4 digits
+} elsif ( $line =~ m/(\#)(\d{4,})/ ) {
+$bug_orig = $1 . $2;
+$bug = "i#$2";
 # match #i123#
 } elsif ( $line =~ m/(\#i)(\d+)(\#)/ ) {
 $bug_orig = $1 . $2 . $3;
@@ -48,6 +53,12 @@ sub search_bugs()
 
 # bnc# is preferred over n# for novell bugs
 $bug =~ s/^n\#/bnc#/;
+# deb# is preferred over debian# for debian bugs
+$bug =~ s/^debian\#/deb#/;
+# easyhack# is sometimes used for fdo# - based easy hacks
+$bug =~ s/^easyhack\#/fdo#/;
+# someone mistyped fdo as fd0
+$bug =~ s/^fd0\#/fdo#/;
 # save the bug number
 %{$pdata->{$piece}{$commit_id}{'bugs'}} = () if (! defined 
%{$pdata->{$piece}{$commit_id}{'bugs'}});
 $pdata->{$piece}{$commit_id}{'bugs'}{$bug} = 1;
@@ -307,15 +318,19 @@ sub get_bug_name($$)
 } else {
 print "warning: not found; using commit message\n";
 }
+} else {
+print "\n";
 }
+} else {
+print "\n";
 }
 
 return $summary;
 }
 
-sub print_bugs($$)
+sub print_bugs($$$)
 {
-my ($pdata, $log) = @_;
+my ($pdata, $log, $convert_func) = @_;
 
 # associate bugs with their summaries and fixers
 my %bugs = ();
@@ -345,7 +360,7 @@ sub print_bugs($$)
 $authors = " [" . join (", ", keys %{$bugs{$bug}{'author'}}) . "]";
 }
 
-printf $log $bug . " " . $summary . $authors . "\n";
+printf $log "%s %s%s\n", $convert_func->($bug), $summary, $authors;
 }
 }
 
@@ -384,6 +399,7 @@ sub usage()
   " commit-log--.log; the 
branch name\n" .
   " is detected automatically\n" .
   " --bugs  print just bug fixes\n" .
+  " --wikibugs  print just bug fixes, use wiki markup\n" .
   " --bug-numbers   print just fixed bug numbers\n" .
   " --rev-list  use \"git rev-list\" instead of \"git log\"; 
useful to check\n" .
   " differences between branches\n" .
@@ -432,6 +448,9 @@ foreach my $arg (@ARGV) {
 } elsif ($arg eq '--bugs') {
 $log_prefix = "bugfixes";
 $print_mode = "bugs";
+} elsif ($arg eq '--wikibugs') {
+$log_prefix = "bugfixes";
+$print_mode = "wikibugs";
 } elsif ($arg eq '--bug-numbers') {
 $log_prefix = "bugnumbers";
 $print_mode = "bugnumbers";
@@ -462,7 +481,11 @@ load_data(\%data, $top_dir, $piece, $branch_name, 
$git_command);
 
 $log = open_log_file($log_dir, $log_prefix, $log_suffix, $top_dir, 
$branch_name);
 if ( $print_mode eq "bugs" ) {
-print_bugs(\%data, $log);
+# identity-transform bug ids
+print_bugs(\%data, $log, sub { return $_[0] } );
+} elsif ( $print_mode eq "wikibugs" ) {
+# wiki-ize bug ids
+print_bugs(\%data, $log, sub { $_[0] =~ s/(.*)\#(.*)/* {{$1|$2}}/; return 
$_[0] });
 } elsif ( $print_mode eq "bugnumbers" ) {
 print_bugnumbers(\%data, $log);
 } else {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [PATCH][PUSHED on master] fix proposed for fdo#49178

[julien2412]

Hi Miklos,

I commited and pushed on master. I hope I haven't just hide a real bug with
this fix.

What about 3.6 and 3.5 branch, can it be pushed too ?

Julien

--
View this message in context: 
http://nabble.documentfoundation.org/PATCH-fix-proposed-for-fdo-49178-tp3989525p3989716.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - 3 commits - bin/lo-commit-stat bin/lo-pack-sources

[Petr Mladek]

 bin/lo-commit-stat  |   38 --
 bin/lo-pack-sources |2 +-
 2 files changed, 33 insertions(+), 7 deletions(-)

New commits:
commit c7e744d669940acf87dc8e580236067ba4ba3743
Author: Petr Mladek 
Date:   Tue Jun 12 19:46:42 2012 +0200

lo-commit-stat: avoid problems whit '%' in the commit message

Change-Id: Ia10bac649cc078f6ef39002d280dcff7e5d0b06d

diff --git a/bin/lo-commit-stat b/bin/lo-commit-stat
index 310548e..1a8e6bb 100755
--- a/bin/lo-commit-stat
+++ b/bin/lo-commit-stat
@@ -80,6 +80,9 @@ sub standardize_summary($)
 my $first_char = lc($1);
 $line =~ s/^./$first_char/;
 }
+# print does not like 0% or so
+$line =~ s/%/%%/g;
+
 
 # FIXME: remove do at the end of line
 #remove bug numbers
commit 88968e244f4b5f82aa2262ac3dd5c6733d553643
Author: Thorsten Behrens 
Date:   Tue Jun 12 03:34:33 2012 +0200

Optionally output wiki-markup from lo-commit-stat

Starts to be a bit annoying to roll shell-sed every release.
We fix too many bugs.

Change-Id: I34b0e9c2bf2c43f84abd555a9d2ac7dde0b6ba3a

diff --git a/bin/lo-commit-stat b/bin/lo-commit-stat
index 0697432..310548e 100755
--- a/bin/lo-commit-stat
+++ b/bin/lo-commit-stat
@@ -25,11 +25,16 @@ sub search_bugs()
 my $bug_orig;
 while (defined $bug) {
 
-# match fdo#123, rhz#123, i#123
+# match fdo#123, rhz#123, i#123, #123
 # but match only bug number with >= 4 digits
-if ( $line =~ m/(\w*\#+\d{4,})/ ) {
+if ( $line =~ m/(\w+\#+\d{4,})/ ) {
 $bug_orig = $1;
 $bug = $1;
+   # default to issuezilla for the #123 variant
+# but match only bug number with >= 4 digits
+} elsif ( $line =~ m/(\#)(\d{4,})/ ) {
+$bug_orig = $1 . $2;
+$bug = "i#$2";
 # match #i123#
 } elsif ( $line =~ m/(\#i)(\d+)(\#)/ ) {
 $bug_orig = $1 . $2 . $3;
@@ -48,6 +53,12 @@ sub search_bugs()
 
 # bnc# is preferred over n# for novell bugs
 $bug =~ s/^n\#/bnc#/;
+# deb# is preferred over debian# for debian bugs
+$bug =~ s/^debian\#/deb#/;
+# easyhack# is sometimes used for fdo# - based easy hacks
+$bug =~ s/^easyhack\#/fdo#/;
+# someone mistyped fdo as fd0
+$bug =~ s/^fd0\#/fdo#/;
 # save the bug number
 %{$pdata->{$piece}{$commit_id}{'bugs'}} = () if (! defined 
%{$pdata->{$piece}{$commit_id}{'bugs'}});
 $pdata->{$piece}{$commit_id}{'bugs'}{$bug} = 1;
@@ -307,15 +318,19 @@ sub get_bug_name($$)
 } else {
 print "warning: not found; using commit message\n";
 }
+} else {
+print "\n";
 }
+} else {
+print "\n";
 }
 
 return $summary;
 }
 
-sub print_bugs($$)
+sub print_bugs($$$)
 {
-my ($pdata, $log) = @_;
+my ($pdata, $log, $convert_func) = @_;
 
 # associate bugs with their summaries and fixers
 my %bugs = ();
@@ -345,7 +360,7 @@ sub print_bugs($$)
 $authors = " [" . join (", ", keys %{$bugs{$bug}{'author'}}) . "]";
 }
 
-printf $log $bug . " " . $summary . $authors . "\n";
+printf $log "%s %s%s\n", $convert_func->($bug), $summary, $authors;
 }
 }
 
@@ -384,6 +399,7 @@ sub usage()
   " commit-log--.log; the 
branch name\n" .
   " is detected automatically\n" .
   " --bugs  print just bug fixes\n" .
+  " --wikibugs  print just bug fixes, use wiki markup\n" .
   " --bug-numbers   print just fixed bug numbers\n" .
   " --rev-list  use \"git rev-list\" instead of \"git log\"; 
useful to check\n" .
   " differences between branches\n" .
@@ -432,6 +448,9 @@ foreach my $arg (@ARGV) {
 } elsif ($arg eq '--bugs') {
 $log_prefix = "bugfixes";
 $print_mode = "bugs";
+} elsif ($arg eq '--wikibugs') {
+$log_prefix = "bugfixes";
+$print_mode = "wikibugs";
 } elsif ($arg eq '--bug-numbers') {
 $log_prefix = "bugnumbers";
 $print_mode = "bugnumbers";
@@ -462,7 +481,11 @@ load_data(\%data, $top_dir, $piece, $branch_name, 
$git_command);
 
 $log = open_log_file($log_dir, $log_prefix, $log_suffix, $top_dir, 
$branch_name);
 if ( $print_mode eq "bugs" ) {
-print_bugs(\%data, $log);
+# identity-transform bug ids
+print_bugs(\%data, $log, sub { return $_[0] } );
+} elsif ( $print_mode eq "wikibugs" ) {
+# wiki-ize bug ids
+print_bugs(\%data, $log, sub { $_[0] =~ s/(.*)\#(.*)/* {{$1|$2}}/; return 
$_[0] });
 } elsif ( $print_mode eq "bugnumbers" ) {
 print_bugnumbers(\%data, $log);
 } else {
commit 87669a44a1463f4e2bd486d2d82b900807148742
Author: Petr Mladek 
Date:   Tue Jun 12 19:42:13 2012 +0200

lo-pack-sources: correct check for valid libreoffice/core dir

Change-Id: I8dbe

[Libreoffice-commits] .: writerfilter/source

[Julien Nabet]

 writerfilter/source/dmapper/DomainMapperTableManager.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 104badf31c8a39994cadc460561bfa01e428b67b
Author: Julien Nabet 
Date:   Tue Jun 12 19:50:23 2012 +0200

Resolves: fdo#49178 CRASH when FILEOPEN particular RTF

Change-Id: Idd938980b91ec8b822a92dfd7013a20fe5b6f498

diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx 
b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
index 89a71f1..2b59358 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
@@ -486,8 +486,9 @@ void DomainMapperTableManager::endOfRowAction()
 
 sal_Int16 nSum = 0;
 sal_uInt32 nPos = 0;
+sal_uInt32 nSizeTableGrid = pTableGrid->size();
 // Ignoring the i=0 case means we assume that the width of the last 
cell matches the table width
-for (int i = m_nCell; i > 1; i--)
+for (sal_uInt32 i = m_nCell; i > 1 && nSizeTableGrid >= i; i--)
 {
 nSum += (*pTableGrid.get())[pTableGrid->size() - i]; // Size of 
the current cell
 pSeparators[nPos].Position = nSum * nFullWidthRelative / 
nFullWidth; // Relative position
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - bin/lo-commit-stat bin/lo-pack-sources

[Petr Mladek]

 bin/lo-commit-stat  |3 +++
 bin/lo-pack-sources |2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 2e353b8daadc588b02fe7c7df5b7f185187e9d58
Author: Petr Mladek 
Date:   Tue Jun 12 19:46:42 2012 +0200

lo-commit-stat: avoid problems whit '%' in the commit message

Change-Id: Ia10bac649cc078f6ef39002d280dcff7e5d0b06d

diff --git a/bin/lo-commit-stat b/bin/lo-commit-stat
index 310548e..1a8e6bb 100755
--- a/bin/lo-commit-stat
+++ b/bin/lo-commit-stat
@@ -80,6 +80,9 @@ sub standardize_summary($)
 my $first_char = lc($1);
 $line =~ s/^./$first_char/;
 }
+# print does not like 0% or so
+$line =~ s/%/%%/g;
+
 
 # FIXME: remove do at the end of line
 #remove bug numbers
commit b74119aed7f0e5761c70d9f800e1675832a717aa
Author: Petr Mladek 
Date:   Tue Jun 12 19:42:13 2012 +0200

lo-pack-sources: correct check for valid libreoffice/core dir

Change-Id: I8dbe60b85d0a330e3b2b5f54984b561fe9be05be

diff --git a/bin/lo-pack-sources b/bin/lo-pack-sources
index 11fcd74..7df4a0f 100755
--- a/bin/lo-pack-sources
+++ b/bin/lo-pack-sources
@@ -399,7 +399,7 @@ unless ( -d "$source_dir" ) {
 }
 
 # check if it is a valid libreoffice-core directory
-$is_lo_core_dir=1 if (-f "$source_dir/autogen.sh" && -f 
"$source_dir/set_soenv.in");
+$is_lo_core_dir=1 if (-f "$source_dir/autogen.sh" && -f 
"$source_dir/config_host.mk.in");
 
 # all tarballs are generated from the libreoffice-core directory
 if (@pieces > 1 && $is_lo_core_dir == 0 ) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [Libreoffice] [GSoC 2012][svg export filter] Weekly Report #3

[Thorsten Behrens]

Marco Cecchetti wrote:
> Report #3
> -
> On this week I enabled support for clip-based slide and shape
> transitions. The following transitions are actually available:
> barnWipe, fourBoxWipe, ellipseWipe, pinWheelWipe. More clip-based
> transitions can be provided by simply fill in the transition
> parameters. I provided basic support for reverse method by
> subtraction, too.
>
Hi Marco,

hats off - excellent progress, and very much in line with your
project plan. I've uploaded the two demo shows to

 http://users.freedesktop.org/~thorsten/gsoc-2012/shape_transitions-week3/

and 

 http://users.freedesktop.org/~thorsten/gsoc-2012/slide_transitions-week3/

for easier trying, will do a quick blog update about it in a bit.

Tiniest possible nit: no need to create OUStrings via this B2UCONST
macro anymore, OUString now has cstring-ctor & comparison (i.e. a
simple rtl::OUString aStr("myStr") will do now). :)

All the best,

-- Thorsten


pgp9ambeOs69e.pgp
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[ANNOUNCE] libreoffice-3.5.5.1 tag created (3.5.5-rc1)

[Petr Mladek]

Hi,

there have been created the libreoffice-3.5.5.1 tag for 3.5.5-rc1
release. The corresponding official builds will be available within
next few days.

See the attached list of changes against 3.5.4-final[*].


Now, you might switch your current 3-5 source tree to it using:

./g fetch --tags
./g checkout -b tag-libreoffice-3.5.5.1 libreoffice-3.5.5.1

Linux distro packages might find source tarballs at
http://dev-builds.libreoffice.org/pre-releases/src/
They will be available from the official page together with the builds.


See also the schedule at 
http://wiki.documentfoundation.org/ReleasePlan#3.5_release
and release criteria at http://wiki.documentfoundation.org/Release_Criteria

[*] The list contains fixes from 3.5.4-rc2. It is created using
libreoffice/core/bin/lo-commit-stat. It parses output from git log and
does not match cherry-picked commits. We might get better results with
'git cherry' or another approach. Feel free to send patches :-)


Best Regards,
Petr
bnc#652364 column break without columns seems to be a page break [Luboš Luňák]
bnc#747461 implement relativeHeight (z-order) in .docx import (part of [Luboš Luňák]
bnc#750255 column break without columns seems to be a page break [Luboš Luňák]
bnc#750838 .docx wrap values mean different things than in LO, map them [Luboš Luňák]
bnc#751077 handle recursive  because of shapes [Luboš Luňák]
bnc#757118 fix horizontal rule width in .doc documents [Luboš Luňák]
bnc#757609 import vmlshape 'hidden' style attribute and apply to controls [Noel Power]
bnc#757910 fix WW8 import of textboxes with thin border/inner margin [Miklos Vajna]
bnc#762542 don't rotate calc shapes if twoCellAnchor, partial fix [Noel Power]
fdo#33634 VIEWING: No difference between cell border 0,5pt and 1,0pt [Markus Mohrhard]
fdo#34638 Inconsistent Localisation of CTRL key abbreviation [Thomas Arnhold]
fdo#35972 Small size icon setting is ignored. [Ivan Timofeev]
fdo#38116 FILESAVE as .doc destroys frame border properties [Michael Stahl]
fdo#40874 [MACRO RECORDING] uno:SetBorderStyle with wrong number of params [Michael Stahl]
fdo#42379 Toolbar item clipped [Ivan Timofeev]
fdo#42405 toolbars may become irrevocably locked in place [Ivan Timofeev]
fdo#42865 MySQL native driver: free() on non-heap pointer; in debug mode abort() [Michael Stahl]
fdo#43249 FILEOPEN: Frame borders not shown in .doc file [Michael Stahl]
fdo#43895 Never let users save in /tmp by default [Stephan Bergmann]
fdo#43989 After installation first launch terminates after splash screen [Andras Timar]
fdo#44174 FILESAVE: RTF import - defective RTF generation, \titlepg missing [Miklos Vajna]
fdo#45190 FILEOPEN Shifted and invisible content in table in rtf document [Miklos Vajna]
fdo#45522 Crash when copying table between Writer and other LibreOffice programs [Miklos Vajna]
fdo#45592 Writer: mailmerge PrintOptions property has wrong type in map [Noel Power]
fdo#45987 FORMCONTROLS: Error message when deleting pages [Markus Mohrhard]
fdo#46074 FILEOPEN: No Recent Documents... [Stephan Bergmann]
fdo#46112 Cell Border double lines imported from old OOo versions [Michael Stahl]
fdo#46687 'Find' toolbar causes writer,calc,impress, not responding [Bjoern Michaelsen]
fdo#47035 Cannot insert jpeg [Christian Lohmaier]
fdo#47044 LibreOffice crashed when accessing Options / Internet / Proxy or Browser Plug-in settings [Stephan Bergmann]
fdo#47325 Existing Base reports won't open in LibreOffice 3.5 [Lionel Elie Mamane]
fdo#47473 EDITING: Legacy reports created by Report Wizard fail to load data [Lionel Elie Mamane]
fdo#47520 ODBC with sqliteodbc: primary key field mostly empty, broken scolling [Lionel Elie Mamane]
fdo#47805 64-bit shell extensions are not registered [Andras Timar]
fdo#48018 Report Does Not Sort by Groupings [Lionel Elie Mamane]
fdo#48068 [SVG] path d="M 20 120 H 40.5.6" not parsed properly [Chr. Rossmanith]
fdo#48345 Display wrong datasets when scrolling through tables [Lionel Elie Mamane]
fdo#48647 ugly hairline double border drawing [Michael Stahl]
fdo#48914 uninstall process should remove .pyc files from install directory [Andras Timar]
fdo#48932 EDITING: Writer 3.5.2 slow typing in large documents [Caolán McNamara]
fdo#49430 imported shape positions incorrect [Noel Power]
fdo#49438 TABLES: drawing layer doesn't paint thin borders in Writer if anti-aliasing disabled [Michael Stahl]
fdo#49724 Update filters for file selector's file type categories [Alberto Ferreira]
fdo#49948 FILEOPEN: No recent documents [Stephan Bergmann]
fdo#49968 FILEOPEN: RTF filter is still buggy since 3.4.5 [Miklos Vajna]
fdo#50139 UI: Cross-references -> index tab "selection" -> "illustration" field contents is cut at left [Andras Timar]
fdo#50141 Word Count Characters (with spaces) incorrect with Numbering on [Muhammad Haggag]
fdo#50144 Additional information in the Insert cross-reference dialogue Selection field [Andras Timar]
fdo#50169 A document causes LO to crash repeatedly [Michael Stahl]
fdo#50173 Styles and Formatting popup cra

[ANNOUNCE] Branch libreoffice-3-5-5 created

[Petr Mladek]

Hi all,

there have been created the libreoffice-3-5-5 branch. It will be used
for fine tuning of the 3.5.5 release.

The following rules apply:

+ preferably just translation or blocker fixes
+ only cherry-picking from libreoffice-3-5 branch
+ 2 additional reviews needed; 2nd reviewer pushes
+ no regular merges back to anything

The 'libreoffice-3-5' branch is still active and will be used for the
3.5.6 bugfix release. Please read more at

   http://wiki.documentfoundation.org/ReleasePlan
   http://wiki.documentfoundation.org/Development/Branches


Now, if you want to switch your clone to the branch, please do:

./g pull -r
./g checkout -b libreoffice-3-5-5 origin/libreoffice-3-5-5

Hopefully it will work for you :-)  Most probably, you will also want to
do (if you haven't done it yet):

git config --global push.default tracking

When you do git push with this, git will push only the branch you are
on; e.g. libreoffice-3-5-5 when you have switched to it.  This will
save you some git shouting at you.


Happy hacking,
Petr

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PATCH-3-5][PATCH-3-5-5] rhbz#678440: Always include User-Agent to avoid 403 from picky servers

[Stephan Bergmann]

It would be nice if 
 
"rhbz#678440: Always include User-Agent to avoid 403 from picky servers" 
fixing  "opening 
urls fails with error 403 on picky servers" could be reviewed for 
inclusion into libreoffice-3-5 and libreoffice-3-5-5.  I consider the 
patch low-risk.


As the patch would not apply as-is to the 3.5 code line, find attached 
an adapted 0001-rhbz-678440-Always-include-User-Agent-to-avoid-403-f.patch.


Thanks,
Stephan
>From 909939dade45864b50aabbb9f3e4eed80e7dce82 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann 
Date: Tue, 12 Jun 2012 18:17:37 +0200
Subject: [PATCH] rhbz#678440: Always include User-Agent to avoid 403 from
 picky servers

(cherry picked from commit 4d0e3127ed2def7212bc05aa860cd06704bb1efe,
with modifications)

Change-Id: I4fa7b45062b0058427f77cf9dc0abebd6b26fb49
---
 ucb/source/ucp/webdav/DAVResourceAccess.cxx |   18 ++
 1 file changed, 18 insertions(+)

diff --git a/ucb/source/ucp/webdav/DAVResourceAccess.cxx b/ucb/source/ucp/webdav/DAVResourceAccess.cxx
index 11b5251..f62ddaf 100644
--- a/ucb/source/ucp/webdav/DAVResourceAccess.cxx
+++ b/ucb/source/ucp/webdav/DAVResourceAccess.cxx
@@ -1151,6 +1151,24 @@ void DAVResourceAccess::getUserRequestHeaders(
 }
 }
 }
+
+// Make sure a User-Agent header is always included, as at least
+// en.wikipedia.org:80 forces back 403 "Scripts should use an informative
+// User-Agent string with contact information, or they may be IP-blocked
+// without notice" otherwise:
+for ( DAVRequestHeaders::iterator i(rRequestHeaders.begin());
+  i != rRequestHeaders.end(); ++i )
+{
+if ( i->first.equalsIgnoreAsciiCaseAsciiL(
+ RTL_CONSTASCII_STRINGPARAM( "User-Agent" ) ) )
+{
+return;
+}
+}
+rRequestHeaders.push_back(
+DAVRequestHeader(
+rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "User-Agent" ) ),
+rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LibreOffice" ) ) ) );
 }
 
 //=
-- 
1.7.10.2

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] Changes to 'refs/tags/libreoffice-3.5.5.1'

[Petr Mladek]

Tag 'libreoffice-3.5.5.1' created by Petr Mladek  at 
2012-06-12 17:18 -0700

Tag 3.5.5.1 (3.5.5-rc1)
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.9 (GNU/Linux)

iQIcBAABAgAGBQJP12vkAAoJEPQ0oe+v7q6j7U0P/0P6l1WOmtjSKpfDgFHgf4FJ
NhUbbB9v1C1lEFY5E+0MOHiG1CgijPwLynvYix9LGQTI/KFLIr9yR+Gh4yuqW2Pg
oJoSpiBusSiK6Yzjl7MNaNC14BfLrx0Ml/P+Ug6K3IE9gTDvaxMvbXtcHI9mq2N0
3T/W2l2bHTG0OtqQ3JLkpqpQDpTTV096X3BXoVtLBlxKZVydZUWcaBoN7EfPtOGN
qF5yoRpTDymlZ4AsNn32ytWgVPt1260GRaBe58NRVWxpvjJv5LUWeDXnLf/TX4t+
N4bJWY1DhLszPQuleLzcZEfM2EcGbl1bZJyIcwvzl45XYlIn5W0UrrxqG5CqRuZe
qIERqdxT6Nt3N+YpHtvasLiUMSAKWhgilv5eWy1YUmexXZPMD7lI2jJvYcqWbPmr
TNNJlQYpRjfK4GMm4a4b0ltq1XeIZ+roMkR4gNLsVw3cOnNNr+qUgY4ft4VNboZV
UAYIT8kkJz3LE20pJT0iEBZjvQ9+xVjG9aj+D4fQ9s5vdgAVN2dlmop9NRcfi9Qd
EyQHOzJYJUPSqTdjje9UyQboIKKQCwhhL7QWfD6GrsIYPAQEMolmNJTpdhA0xATj
gLeEPV1ut15/+7xNvDhuqDm7rHe3n9EQHKWjVwiQGJMIsONWrp/FG0J3X+xNxNJI
+vlVUCGw/WQ7I7OeNeUX
=DePJ
-END PGP SIGNATURE-

Changes since libreoffice-3.5.0.1-4:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] Changes to 'refs/tags/libreoffice-3.5.5.1'

[Petr Mladek]

Tag 'libreoffice-3.5.5.1' created by Petr Mladek  at 
2012-06-12 17:18 -0700

Tag 3.5.5.1 (3.5.5-rc1)
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.9 (GNU/Linux)

iQIcBAABAgAGBQJP12vkAAoJEPQ0oe+v7q6jDT8P/3X1IJ3PbND1NLhoD15L1TL/
9NiusQR6e/3aMdnkCh8Qo+wHCw5iqHIl2VhLGNxE/4m36ezIOg8j6ebRtVNdt6jK
zEEzGCV5HiznMwRfOLk3wN+9o/viTHoNGhPfdvDaNnAo2sEtA2Rl0kwbUZk2NPMx
dVQCVHppdY/PMoBTc6AzUjHZjASFIyRrtqRSy0ZMLmhI/3AqYWOaB21bcgfpyAp4
+JrW4ryyzOvXK+XEQS6UaEN3kP7rqdrYlTwJ5mLLCctZZHn3OT2IxF+uN/GZb0NI
jr808wN7OXWARwLHOmChUWrgVzAcPL1oNCctWH+lu0CK6t9vW7k1tLCL05p0Kd/A
5zd5qnzNia/89bLM625TT2EtXogRfQ8LqrSZcsGIXNt4fcke2Uonhfva74HOHUa9
fiY2t9mAfTaQ910v4MioZPW89GvuoVPntQ5nknigkELCJeVFJ9HeVIpI0eFLoMCX
xHmMhGPMHsIUydvk47oLPTARFIECrcQnilVgyaTqJlGSLuKwKD707yLwhwa0IpWZ
Z2akmO9iDqDXg+XRfF8/z5Yc7rZsion94JAib+KC9nMC5jAEgbi1N1squUj7SPpO
yXwfrZIOHYBK+jE5b6u4OjTwU1LnBwiDJLUWUTv0klxmH38NZ+Cdhk4XZjCvaFkD
R4xE/B+YMrpXeFvPCmHZ
=H177
-END PGP SIGNATURE-

Changes since libreoffice-3-5-branch-point-37:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] Changes to 'refs/tags/libreoffice-3.5.5.1'

[Petr Mladek]

Tag 'libreoffice-3.5.5.1' created by Petr Mladek  at 
2012-06-12 17:18 -0700

Tag 3.5.5.1 (3.5.5-rc1)
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.9 (GNU/Linux)

iQIcBAABAgAGBQJP12vkAAoJEPQ0oe+v7q6juwsP/igsnyeua1aHy+Sc/RSRFKN/
eDucob4/a9o7htFVTqQ7ri3f/RZ7Yr6jtUjHXp3TXX/KIV00+rWDLqvFVW91Aycd
TqgQyI7yElNUtKXex5x9oJqDbDh1Y+nxz65ZM+NVvhVAqglcqp7kvCUzaUySs1s8
BtfllnG85ceNtJiGdkx4CL1apvX6464oJ0vnG4It7qZV1A0aScsWBqAbGsnM
9wjUrzItjXxaY9fSkyq0sK2nsI3rWRE8zZQNDUJFS4XlEkaZOtYyshT6YtX4ZSWI
RZqwUOYj47w7lWpNR0L0LbJqwYUcgKlCv+AgGVC2JrewvDjlX2UwNewRE65RuOIC
J+1PVH8S41Zan/d8FdTpuDwyc1ft6yhi1qyntLQuG8nVMWn+GVMk/HQLfNZj0lRG
qIzxWw0UJvjFotzh9wUXCnetnygRI+OTLV6vYV6nfil0rpHAA/HZ/lEaQ/GsMZDy
aGLfg6xe/xSLPu59f/Cmh0qfwdC9lLb0VsZ4Z77OpQ7JTeM0/NKmzY12j+3qQopv
4TFlhTyoGEzO1GQTgIz8kmff+pYMSAjCuYoxfg6ZaPvkrVRXdSCeHEwM0MXRhhLM
67WNsA6EUF+73x5KgQfs66hk0zbAmklccTsNn8QEmIFTyzaiXlr77ZqjrvjMqQxL
OOKZVtPJWFR0bYi/Deqh
=CC1q
-END PGP SIGNATURE-

Changes since libreoffice-3-5-branch-point-1340:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - ucb/source

[Stephan Bergmann]

 ucb/source/ucp/webdav/DAVResourceAccess.cxx |   15 +++
 1 file changed, 15 insertions(+)

New commits:
commit d41f59ddbfafd3f9a2b26a7a9a2999b77095ae36
Author: Stephan Bergmann 
Date:   Tue Jun 12 18:17:37 2012 +0200

rhbz#678440: Always include User-Agent to avoid 403 from picky servers

Change-Id: I4fa7b45062b0058427f77cf9dc0abebd6b26fb49
(cherry picked from commit 4d0e3127ed2def7212bc05aa860cd06704bb1efe)

diff --git a/ucb/source/ucp/webdav/DAVResourceAccess.cxx 
b/ucb/source/ucp/webdav/DAVResourceAccess.cxx
index 0e0f34a..890f94b 100644
--- a/ucb/source/ucp/webdav/DAVResourceAccess.cxx
+++ b/ucb/source/ucp/webdav/DAVResourceAccess.cxx
@@ -1146,6 +1146,21 @@ void DAVResourceAccess::getUserRequestHeaders(
 }
 }
 }
+
+// Make sure a User-Agent header is always included, as at least
+// en.wikipedia.org:80 forces back 403 "Scripts should use an informative
+// User-Agent string with contact information, or they may be IP-blocked
+// without notice" otherwise:
+for ( DAVRequestHeaders::iterator i(rRequestHeaders.begin());
+  i != rRequestHeaders.end(); ++i )
+{
+if ( i->first.equalsIgnoreAsciiCase( "User-Agent" ) )
+{
+return;
+}
+}
+rRequestHeaders.push_back(
+DAVRequestHeader( "User-Agent", "LibreOffice" ) );
 }
 
 //=
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: ucb/source

[Stephan Bergmann]

 ucb/source/ucp/webdav/DAVResourceAccess.cxx |   15 +++
 1 file changed, 15 insertions(+)

New commits:
commit 4d0e3127ed2def7212bc05aa860cd06704bb1efe
Author: Stephan Bergmann 
Date:   Tue Jun 12 18:17:37 2012 +0200

rhbz#678440: Always include User-Agent to avoid 403 from picky servers

Change-Id: I4fa7b45062b0058427f77cf9dc0abebd6b26fb49

diff --git a/ucb/source/ucp/webdav/DAVResourceAccess.cxx 
b/ucb/source/ucp/webdav/DAVResourceAccess.cxx
index 0e0f34a..890f94b 100644
--- a/ucb/source/ucp/webdav/DAVResourceAccess.cxx
+++ b/ucb/source/ucp/webdav/DAVResourceAccess.cxx
@@ -1146,6 +1146,21 @@ void DAVResourceAccess::getUserRequestHeaders(
 }
 }
 }
+
+// Make sure a User-Agent header is always included, as at least
+// en.wikipedia.org:80 forces back 403 "Scripts should use an informative
+// User-Agent string with contact information, or they may be IP-blocked
+// without notice" otherwise:
+for ( DAVRequestHeaders::iterator i(rRequestHeaders.begin());
+  i != rRequestHeaders.end(); ++i )
+{
+if ( i->first.equalsIgnoreAsciiCase( "User-Agent" ) )
+{
+return;
+}
+}
+rRequestHeaders.push_back(
+DAVRequestHeader( "User-Agent", "LibreOffice" ) );
 }
 
 //=
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - instsetoo_native/util solenv/inc

[Petr Mladek]

 instsetoo_native/util/openoffice.lst |   30 +++---
 solenv/inc/minor.mk  |2 +-
 2 files changed, 16 insertions(+), 16 deletions(-)

New commits:
commit 66c88a48c34b3dc1382d4a2e0916dd06d578c101
Author: Petr Mladek 
Date:   Tue Jun 12 18:11:42 2012 +0200

bump product version to 3.5.6-rc0+

Change-Id: I8d03cd70127804607feedee908845660d1a43d0e

diff --git a/instsetoo_native/util/openoffice.lst 
b/instsetoo_native/util/openoffice.lst
index 3b19f2f..9aa7a5e 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -4,7 +4,7 @@ Globals
{
variables
{
-   UREPACKAGEVERSION 3.5.5
+   UREPACKAGEVERSION 3.5.6
URELAYERVERSION 1
 REFERENCEOOOMAJORMINOR 3.4
UNIXBASISROOTNAME libreoffice3.5
@@ -58,7 +58,7 @@ LibreOffice
 POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3.5
USERDIRPRODUCTVERSION 3
-   ABOUTBOXPRODUCTVERSION 3.5.5
+   ABOUTBOXPRODUCTVERSION 3.5.6
ABOUTBOXPRODUCTVERSIONSUFFIX rc0+
BASEPRODUCTVERSION 3.5
 PCPFILENAME libreoffice.pcp
@@ -70,7 +70,7 @@ LibreOffice
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
-   PACKAGEVERSION 3.5.5
+   PACKAGEVERSION 3.5.6
PACKAGEREVISION {buildid}
LICENSENAME LGPL
GLOBALFILEGID gid_File_Lib_Vcl
@@ -117,7 +117,7 @@ LibreOffice_wJRE
 POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3.5
USERDIRPRODUCTVERSION 3
-   ABOUTBOXPRODUCTVERSION 3.5.5
+   ABOUTBOXPRODUCTVERSION 3.5.6
ABOUTBOXPRODUCTVERSIONSUFFIX rc0+
BASEPRODUCTVERSION 3.5
UPDATEURL http://update.libreoffice.org/check.php
@@ -128,7 +128,7 @@ LibreOffice_wJRE
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
-   PACKAGEVERSION 3.5.5
+   PACKAGEVERSION 3.5.6
PACKAGEREVISION {buildid}
LICENSENAME LGPL
WITHJREPRODUCT 1
@@ -176,7 +176,7 @@ LibreOffice_Dev
 POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3.5
USERDIRPRODUCTVERSION 3
-   ABOUTBOXPRODUCTVERSION 3.5.5
+   ABOUTBOXPRODUCTVERSION 3.5.6
ABOUTBOXPRODUCTVERSIONSUFFIX rc0+
BASEPRODUCTVERSION 3.5
DEVELOPMENTPRODUCT 1
@@ -192,7 +192,7 @@ LibreOffice_Dev
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
-   PACKAGEVERSION 3.5.5
+   PACKAGEVERSION 3.5.6
PACKAGEREVISION {buildid}
LICENSENAME LGPL
GLOBALFILEGID gid_File_Lib_Vcl
@@ -279,7 +279,7 @@ LibreOffice_SDK
 POSTVERSIONEXTENSION SDK
 POSTVERSIONEXTENSIONUNIX sdk
 BRANDPACKAGEVERSION 3.5
-PACKAGEVERSION 3.5.5
+PACKAGEVERSION 3.5.6
 PACKAGEREVISION {buildid}
 PACK_INSTALLED 1
 POOLPRODUCT 0
@@ -323,7 +323,7 @@ LibreOffice_Dev_SDK
 POSTVERSIONEXTENSION SDK
 POSTVERSIONEXTENSIONUNIX sdk
 BRANDPACKAGEVERSION 3.5
-PACKAGEVERSION 3.5.5
+PACKAGEVERSION 3.5.6
 PACKAGEREVISION {buildid}
 BASISPACKAGEPREFIX lodevbasis
 UREPACKAGEPREFIX lodev
@@ -371,7 +371,7 @@ LibreOffice_Test
 POSTVERSIONEXTENSION TEST
 POSTVERSIONEXTENSIONUNIX test
 BRANDPACKAGEVERSION 3.5
-PACKAGEVERSION 3.5.5
+PACKAGEVERSION 3.5.6
 PACKAGEREVISION {buildid}
 PACK_INSTALLED 1
 POOLPRODUCT 0
@@ -415,7 +415,7 @@ LibreOffice_Dev_Test
 POSTVERSIONEXTENSION TEST
 POSTVERSIONEXTENSIONUNIX test
 BRANDPACKAGEVERSION 3.5
-PACKAGEVERSION 3.5.5
+PACKAGEVERSION 3.5.6
 PACKAGEREVISION {buildid}
 BASISPACKAGEPREFIX lodevbasis
 UREPACKAGEPREFIX lodev
@@ -463,7 +463,7 @@ OxygenOffice
 POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3.5
  

[Libreoffice-commits] Changes to 'libreoffice-3-5-5'

[Petr Mladek]

New branch 'libreoffice-3-5-5' available with the following commits:
commit 617a24897e10e309defebce7e1e2f814b783531f
Author: Petr Mladek 
Date:   Tue Jun 12 18:08:17 2012 +0200

Branch libreoffice-3-5-5

This is 'libreoffice-3-5-5' - the stable branch for the 3.5.5 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 3.5.x release,
please use the 'libreoffice-3-5' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: Iaa9a3e3266be8edbcff84331d3a8dc2021e0ca7d

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] Changes to 'libreoffice-3-5-5'

[Petr Mladek]

New branch 'libreoffice-3-5-5' available with the following commits:
commit b07679a93bc11601265aeb15f68c1e21b508aedc
Author: Petr Mladek 
Date:   Tue Jun 12 18:08:17 2012 +0200

Branch libreoffice-3-5-5

This is 'libreoffice-3-5-5' - the stable branch for the 3.5.5 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 3.5.x release,
please use the 'libreoffice-3-5' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: I7a514cf794a8c82304c8e9bb74bd27ba7b74d0ba

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] Changes to 'libreoffice-3-5-5'

[Petr Mladek]

New branch 'libreoffice-3-5-5' available with the following commits:
commit 92ebfa3364996772dea3d2265c0cb04c97de4bb0
Author: Petr Mladek 
Date:   Tue Jun 12 18:08:16 2012 +0200

Branch libreoffice-3-5-5

This is 'libreoffice-3-5-5' - the stable branch for the 3.5.5 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 3.5.x release,
please use the 'libreoffice-3-5' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: I1f9357e7663ea72b987dfc0f652a9a66239825d5

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'feature/cmclayout' - 2 commits - vcl/inc vcl/source

[Caolán McNamara]

 vcl/inc/vcl/builder.hxx|1 
 vcl/inc/vcl/tabctrl.hxx|3 +
 vcl/source/control/tabctrl.cxx |   30 ++---
 vcl/source/window/builder.cxx  |   90 +++--
 4 files changed, 98 insertions(+), 26 deletions(-)

New commits:
commit 4eab7331684945213897588ae3303be4c1c2453e
Author: Caolán McNamara 
Date:   Tue Jun 12 16:02:26 2012 +0100

assign tab page ids such that retrofitting existing code is easier

diff --git a/vcl/inc/vcl/builder.hxx b/vcl/inc/vcl/builder.hxx
index f98b552..b44cb3f 100644
--- a/vcl/inc/vcl/builder.hxx
+++ b/vcl/inc/vcl/builder.hxx
@@ -98,6 +98,7 @@ public:
 ~VclBuilder();
 Window *get_widget_root();
 Window *get_by_name(rtl::OString sID);
+rtl::OString get_by_window(const Window *pWindow);
 //for the purposes of retrofitting this to the existing code
 //look up sID, clone its properties into replacement and
 //splice replacement into the tree instead of it, without
diff --git a/vcl/inc/vcl/tabctrl.hxx b/vcl/inc/vcl/tabctrl.hxx
index fd064db..14c68e0 100644
--- a/vcl/inc/vcl/tabctrl.hxx
+++ b/vcl/inc/vcl/tabctrl.hxx
@@ -196,6 +196,9 @@ public:
 
 // returns the rectangle of the tab for page nPageId
 Rectangle GetTabBounds( sal_uInt16 nPageId ) const;
+
+// rename nOldId to nNewId);
+void ReassignPageId(sal_uInt16 nOldId, sal_uInt16 nNewId);
 };
 
 #endif  // _SV_TABCTRL_HXX
diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx
index 0ac4060..ccf6b4c 100644
--- a/vcl/source/control/tabctrl.cxx
+++ b/vcl/source/control/tabctrl.cxx
@@ -2228,7 +2228,20 @@ void TabControl::SetMinimumSizePixel( const Size& 
i_rSize )
 mpTabCtrlData->maMinSize = i_rSize;
 }
 
-// ---
+void TabControl::ReassignPageId(sal_uInt16 nOldId, sal_uInt16 nNewId)
+{
+for( std::vector< ImplTabItem >::iterator it = 
mpTabCtrlData->maItemList.begin();
+ it != mpTabCtrlData->maItemList.end(); ++it )
+{
+if( it->mnId == nOldId )
+it->mnId = nNewId;
+}
 
+if (mnActPageId == nOldId)
+mnActPageId = nNewId;
+
+if (mnCurPageId == nOldId)
+mnCurPageId = nOldId;
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 563322b..2f8e5d2 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -183,21 +183,31 @@ Window *VclBuilder::makeObject(Window *pParent, const 
rtl::OString &name, const
 if (pParent && pParent->GetType() == WINDOW_TABCONTROL)
 {
 //We have to add a page
-TabControl *pTabControl = static_cast(pParent);
-TabPage* pPage = new TabPage(pTabControl);
-m_aChildren.push_back(WinAndId(rtl::OString(), pPage));
-
-//And give the page one container as a child to make it a layout 
enabled
-//tab page
-VclBin* pContainer = new VclBin(pPage);
-m_aChildren.push_back(WinAndId(rtl::OString(), pContainer));
-pParent = pContainer;
 
-//keep it simple and make pageid == position
-sal_uInt16 nNewPageId = pTabControl->GetPageCount()+1;
+//make default pageid == -position. Partitioning the
+//id space into negative numbers for auto-generated
+//ids and positive numbers for the handleTabChild
+//derived ids
+TabControl *pTabControl = static_cast(pParent);
+sal_uInt16 nNewPageId = -(pTabControl->GetPageCount()+1);
 pTabControl->InsertPage(nNewPageId, rtl::OUString());
-pTabControl->SetTabPage(nNewPageId, pPage);
 pTabControl->SetCurPageId(nNewPageId);
+
+bool bIsPlaceHolder = name.isEmpty();
+
+if (!bIsPlaceHolder)
+{
+TabPage* pPage = new TabPage(pTabControl);
+m_aChildren.push_back(WinAndId(rtl::OString(), pPage));
+
+//And give the page one container as a child to make it a layout 
enabled
+//tab page
+VclBin* pContainer = new VclBin(pPage);
+m_aChildren.push_back(WinAndId(rtl::OString(), pContainer));
+pParent = pContainer;
+
+pTabControl->SetTabPage(nNewPageId, pPage);
+}
 }
 
 Window *pWindow = NULL;
@@ -341,6 +351,8 @@ void VclBuilder::reorderWithinParent(Window &rWindow, 
sal_uInt16 nNewPosition)
 
 void VclBuilder::handleTabChild(Window *pParent, xmlreader::XmlReader &reader)
 {
+rtl::OString sID;
+
 int nLevel = 1;
 stringmap aProperties;
 while(1)
@@ -356,6 +368,17 @@ void VclBuilder::handleTabChild(Window *pParent, 
xmlreader::XmlReader &reader)
 ++nLevel;
 if (name.equals(RTL_CONSTASCII_STRINGPARAM("property")))
 collectProperty(reader, aProperties);
+else if (name.equals(RTL_CONSTASCII_STRINGPARAM("object")))
+{
+while (reader.nextAttribute(&nsId, &name))
+   

Fwd: [LATE FEATURE] Windows UI improvements

[Andras Timar]

fwd to list...


-- Forwarded message --
From: Andras Timar 
Date: 2012/6/12
Subject: Re: [LATE FEATURE] Windows UI improvements
To: Jan Holesovsky 


2012/6/12 Jan Holesovsky :
>
> OK to go ahead?  Needs 3 cross-affiliation approvals - Andras, Astron, Jesús? 
> ;-)
>

+1 from me.

Andras
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: IsOfficeRunning() (was: [tdf-core] I'm sure this is an accident...)

[Michael Meeks]

On Tue, 2012-06-12 at 15:37 +0200, Andras Timar wrote:
> My proposal is to remove IsOfficeRunning custom action from installer, 
> and delete it from source code. Does anybody know why it was developed 
> in the first place?

Sounds entirely sensible, it seems the original cure is worse than the
symptoms for that 'feature' :-)

Thanks !

Michael.

-- 
michael.me...@suse.com  <><, Pseudo Engineer, itinerant idiot

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: binfilter/bf_svx

[Stephan Bergmann]

 binfilter/bf_svx/source/svdraw/svx_svdobj.cxx |2 +-
 binfilter/bf_svx/source/xoutdev/svx_xline.cxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 74c2636f88b46f5d17de76fd128e842386aa3217
Author: Stephan Bergmann 
Date:   Tue Jun 12 17:22:24 2012 +0200

Adapt to 6d78c490b0923c22d125286ebdae2e41edd28f6c

... "Get rid of GRADIENT_* defines, they conflict with Windows GDI types."

Change-Id: Id05d47005e56ba5fd24b1b1ce17b069e011a4003

diff --git a/binfilter/bf_svx/source/svdraw/svx_svdobj.cxx 
b/binfilter/bf_svx/source/svdraw/svx_svdobj.cxx
index 48bf941..01128ea 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdobj.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdobj.cxx
@@ -1640,7 +1640,7 @@ SAL_WNODEPRECATED_DECLARATIONS_POP
 /*?*/   // to be shown line has transparence, output via MetaFile
 /*?*/   UINT8 nScaledTrans((UINT8)((nTransparence * 255)/100));
 /*?*/   Color aTransColor(nScaledTrans, nScaledTrans, nScaledTrans);
-/*?*/   Gradient aGradient(GRADIENT_LINEAR, aTransColor, aTransColor);
+/*?*/   Gradient aGradient(GradientStyle_LINEAR, aTransColor, 
aTransColor);
 /*?*/   GDIMetaFile aMetaFile;
 /*?*/   VirtualDevice aVDev;
 /*?*/   Volume3D aVolume;
diff --git a/binfilter/bf_svx/source/xoutdev/svx_xline.cxx 
b/binfilter/bf_svx/source/xoutdev/svx_xline.cxx
index 6bc5306..e096a0d 100644
--- a/binfilter/bf_svx/source/xoutdev/svx_xline.cxx
+++ b/binfilter/bf_svx/source/xoutdev/svx_xline.cxx
@@ -460,7 +460,7 @@ namespace binfilter {
 /*?*/   MapMode aMap( pOldOut->GetMapMode() );
 /*?*/   const BYTE  cTrans = nLineTransparence * 255 / 100;
 /*?*/   const Color aTrans( cTrans, cTrans, cTrans );
-/*?*/   GradientaTransGradient( GRADIENT_LINEAR, aTrans, aTrans );
+/*?*/   GradientaTransGradient( GradientStyle_LINEAR, aTrans, 
aTrans );
 /*?*/
 /*?*/   pOut = &aVDev;
 /*?*/   aVDev.EnableOutput( FALSE );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sw/source

[Caolán McNamara]

 sw/source/ui/misc/outline.hrc |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 04f3f84eeda03c358133f1e68d8a1df8259cb61b
Author: Caolán McNamara 
Date:   Tue Jun 12 13:07:20 2012 +0100

FT_CHARFMT and LB_CHARFMT shared the same resource id (cherry picked from 
commit 125cecd8fa6036986f1d442bc7d902b547c11e75)

diff --git a/sw/source/ui/misc/outline.hrc b/sw/source/ui/misc/outline.hrc
index 2f8a4a4..17dd319 100644
--- a/sw/source/ui/misc/outline.hrc
+++ b/sw/source/ui/misc/outline.hrc
@@ -84,7 +84,7 @@
 #define MN_FORM9119
 #define MN_SAVE 120
 
-#define FL_LEVEL130
+#define FL_LEVEL130
 #define LB_LEVEL131
 #define WIN_PREVIEW 132
 #define FT_SUFFIX   134
@@ -95,4 +95,4 @@
 
 #define ST_FORM 140
 #define FT_CHARFMT  141
-#define LB_CHARFMT  141
+#define LB_CHARFMT  142
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [REVIEW][PUSHED 3-5] fdo#43249: WW8: fix double border import regression

[Caolán McNamara]

On Tue, 2012-06-12 at 15:51 +0200, Michael Stahl wrote:
> yet another import filter where double border widths are tripled, fix
> proposed for libreoffice-3-5:
> 
> http://cgit.freedesktop.org/libreoffice/core/commit/?id=36e43b52992735c622833e923faa63774b9e2f76

pushed to 3-5.

C.

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sw/source

[Caolán McNamara]

 sw/source/filter/ww8/ww8graf.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit 56214e02055862f196900be9a7318cbe54a48f1c
Author: Michael Stahl 
Date:   Tue Jun 12 15:40:45 2012 +0200

fdo#43249: WW8: fix double border import:

The border widths are tripled on import, because that is effectively
what SetWidth does for DOUBLE borders; set a divisor of 3 similar to
e2ffb71305c5f085eec6d396651c76d6daee3406
70a6a4d425558340bb49507975343a3e0a1bdde8

Change-Id: I40b175bedc1ed2d564be126bf9e6870b43474aba
(cherry picked from commit 36e43b52992735c622833e923faa63774b9e2f76)

Signed-off-by: Caolán McNamara 

diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx
index 5ac204b..8182cff 100644
--- a/sw/source/filter/ww8/ww8graf.cxx
+++ b/sw/source/filter/ww8/ww8graf.cxx
@@ -1571,6 +1571,10 @@ sal_Int32 
SwWW8ImplReader::MatchSdrBoxIntoFlyBoxItem(const Color& rLineColor,
 
 aLine.SetWidth( nLineThick ); // No conversion here, nLineThick is 
already in twips
 aLine.SetStyle( nIdx );
+if (editeng::DOUBLE == nIdx)
+{  // fdo#43249: divide width by 3 for outer line, gap, inner line
+   aLine.ScaleMetrics(1, 3);
+}
 
 for(sal_uInt16 nLine = 0; nLine < 4; ++nLine)
 rBox.SetLine(new SvxBorderLine( aLine ), nLine);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: IsOfficeRunning() (was: [tdf-core] I'm sure this is an accident...)

[Jesús Corrius]

> After some research I found that IsOfficeRunning() is completely useless. At
> least in main installer. It checks if (Libre)Office is running, and if it
> is, installer aborts. Originally it tried to rename a file in the
> installation folder with user privileges - instant fail on Vista and Windows
> 7. Now it checks if soffice.bin is running. However, soffice.bin can belong
> to AOO, Symphony etc. that we have no business with. We could fix
> IsOfficeRunning() so it detects LibreOffice only. But why bother? Installer
> will not let overwrite files in use anyway. It will display a dialog that
> user installer needs to update files in use, and it will list the affected
> processes. It is more reliable, than IsOfficeRunning(). If user ignores the
> files in use warning, no problem, things will get sorted out after a
> restart.

I second your opinion.
The worst case scenario is quite unlikely to happen and it's not that
bad in any case.
And there have been way too many people who can't install LibreOffice
on Windows because of this detection.

> My proposal is to remove IsOfficeRunning custom action from installer, and
> delete it from source code. Does anybody know why it was developed in the
> first place?

There might be many reasons, like installation repair, parallel
installations, etc. But i am just guessing here.

-- 
Jesús Corrius 
Deputy of the Board of Directors
The Document Foundation, Zimmerstr. 69, 10117 Berlin,Germany
Rechtsfähige Stiftung des bürgerlichen Rechts
Legal details: http://www.documentfoundation.org/imprint
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[LATE FEATURE] Windows UI improvements

[Jan Holesovsky]

Hi,

Based on the Mirek's, Astron's and others designs / advice [thank you so
much for all your help! :-)], I finally managed to get the Windows 7
look to this state:

http://artax.karlin.mff.cuni.cz/~kendy/design-list/toolbar-gradient.png

I'd like to cherry-pick the remaining changes (menubar, toolbar) to
libreoffice-3-6; they are mostly trivial, but because change of look is
quite a visible change, I rather handle it as a late feature ;-)

http://cgit.freedesktop.org/libreoffice/core/commit/?id=eac708b0b188d7e6477922bb4bc03199cd92f5ca
http://cgit.freedesktop.org/libreoffice/core/commit/?id=f268355606630e9fc07a945859ec57ae00f6e427

(depends on
http://cgit.freedesktop.org/libreoffice/core/commit/?id=6d78c490b0923c22d125286ebdae2e41edd28f6c
 )

There are 3 pending issues:

1) The text in the menus in order to be really black (currently it is
still transparent which looks ugly when you move the window over
something light) needs a hack described here:

http://msdn.microsoft.com/en-us/library/windows/desktop/bb688195%28v=vs.85%29.aspx

[search for "Appendix B: Painting the Caption Title"]

2) The closing "x" at the right handles the transparency wrongly, need
to fix that too

3) The line between the menu and toolbar should be lighter a bit

I'll do the follow-up fixes ASAP, hopefully still before the beta tag.

OK to go ahead?  Needs 3 cross-affiliation approvals - Andras, Astron, Jesús? 
;-)

Thank you,
Kendy

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: writerfilter/source

[Miklos Vajna]

 writerfilter/source/dmapper/FFDataHandler.cxx |   17 ++---
 writerfilter/source/dmapper/FFDataHandler.hxx |5 +++--
 2 files changed, 17 insertions(+), 5 deletions(-)

New commits:
commit 9b0be41e96abb0a6547afad7de3a24f336bfdb5a
Author: Miklos Vajna 
Date:   Tue Jun 12 16:50:56 2012 +0200

n#766477 dmapper: import NS_ooxml::LN_CT_FFCheckBox_default

Change-Id: If7edb301fa90a49d79fc5322a7c19ee2591f5494

diff --git a/writerfilter/source/dmapper/FFDataHandler.cxx 
b/writerfilter/source/dmapper/FFDataHandler.cxx
index 4dac6f4..2a9d97b 100644
--- a/writerfilter/source/dmapper/FFDataHandler.cxx
+++ b/writerfilter/source/dmapper/FFDataHandler.cxx
@@ -41,7 +41,8 @@ FFDataHandler::FFDataHandler() :
 LoggedProperties(dmapper_logger, "FFDataHandler"),
 m_nCheckboxHeight(0),
 m_bCheckboxAutoHeight(false),
-m_bCheckboxChecked(false)
+m_nCheckboxChecked(-1),
+m_nCheckboxDefault(-1)
 {
 }
 
@@ -77,7 +78,12 @@ bool FFDataHandler::getCheckboxAutoHeight() const
 
 bool FFDataHandler::getCheckboxChecked() const
 {
-return m_bCheckboxChecked;
+if (m_nCheckboxChecked != -1)
+return m_nCheckboxChecked;
+else if (m_nCheckboxDefault != -1)
+return m_nCheckboxDefault;
+else
+return false;
 }
 
 const rtl::OUString & FFDataHandler::getDropDownResult() const
@@ -126,7 +132,12 @@ void FFDataHandler::lcl_sprm(Sprm & r_Sprm)
 break;
 case NS_ooxml::LN_CT_FFCheckBox_checked:
 {
-m_bCheckboxChecked = r_Sprm.getValue()->getInt();
+m_nCheckboxChecked = r_Sprm.getValue()->getInt();
+}
+break;
+case NS_ooxml::LN_CT_FFCheckBox_default:
+{
+m_nCheckboxDefault = r_Sprm.getValue()->getInt();
 }
 break;
 case NS_ooxml::LN_CT_FFData_checkBox:
diff --git a/writerfilter/source/dmapper/FFDataHandler.hxx 
b/writerfilter/source/dmapper/FFDataHandler.hxx
index 5a192ab..b9d538c 100644
--- a/writerfilter/source/dmapper/FFDataHandler.hxx
+++ b/writerfilter/source/dmapper/FFDataHandler.hxx
@@ -58,7 +58,7 @@ public:
 // member: checkboxAutoHeight
 bool getCheckboxAutoHeight() const;
 
-// member: checkboxChecked
+// member: checkboxChecked or checkboxDefault (if the previous is not set)
 bool getCheckboxChecked() const;
 
 // member: dropDownResult
@@ -79,7 +79,8 @@ private:
 rtl::OUString m_sStatusText;
 sal_uInt32 m_nCheckboxHeight;
 bool m_bCheckboxAutoHeight;
-bool m_bCheckboxChecked;
+int m_nCheckboxChecked;
+int m_nCheckboxDefault;
 rtl::OUString m_sDropDownResult;
 DropDownEntries_t m_DropDownEntries;
 rtl::OUString m_sTextDefault;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

probabilistic approach to tinderboxing

[Bjoern Michaelsen]

Hi all,

this is a proposal to get as much focused tinderboxing as possible with limited
resources and unreliable build clients. This also assumes patches under
consideration to be independant (that is: without conflicts) and not dependant
on a specific order. gerrit allow us to have patches independant of order as
they are not yet merged/picked to the branch. We can also easily exclude any
patch on gerrit that conflicts against the existing patches under
consideration: To do so we cherry-pick the new patch on the tip of the branch
and then cherry-pick all patches under consideration on top of that. If it
conflicts, we can report that back.(*)

== Testcase == 

Tinderboxes will be grouped in "testcases": All tinderboxes in belonging to one
"testcase" are assumed to provide the same results for the same input. The
simplest testcase is: "completing a build on platform foo" while more complex
testcases include "completed a build on platform foo and run checks".  A
testcase is assumed to have a rather stable long term empiric value that one
patch does not breaks it: p-innocent(testcase). Whenever a new patch is
commited for consideration we assume its inital "innocence" to be average:

 p-innocent(patch) = p-innocent(testcase)

== Giving a tinderbox a subset to test ==

There are two possibly useful results out of a tinderbox run:
- If the tinderbox run is successful, we can mark all patches as good and
  remove them from the patches under consideration
- If the tinderbox run is a failure and only contains one patch, we can mark
  that patch as bad and remove it from the patches under consideration
- All other cases have no directly deductable action

=== optimistic tinderbox run ===

A completed tinderbox run provides us with the most information, if we assume
it to fail half of the time (biggest insecurity). So, this is the first thing
to give a tinderbox to test:
 - Pick the most innocent looking patches (highest p-innocent(patch))
   - for patches with the same innocence prefer the oldest ones first
 - Add patches as long as the innocence of the patchset:
   p-innocent(patchset) = product(p-innocent(patchn) ...)
   is above 0.5
After sending off the tinderbox with this patchset, do:
   p-innocent(patch) *= p-innocent(testcase)
reducing the innocence of the patches without waiting for results. So we assume
the patches of the set to be partially guilty until proven innocent.

If the tinderbox succeeds, mark all patches as good and remove them from the
patches under consideration.

=== pessimistic tinderbox run ===

A failed tinderbox run provides us with most information, if it contains only
one patch. So if the innocence of one or more patches drops below 0.5:

 p-innocent(dirtypatch)<= 0.5

or if there is currently only one patch under consideration instead of doing
the optimistic approach above, do a pessimistic tinderbox run with just one
patch. Select the patch with the lowest p-innocent(patch) and, if there are
multiple patches with equal p-innocent(patch), select the oldest candidate.
After sending off the tinderbox with just this one patch, do:

 p-innocent(patch)/=p-innocent(testcase)

for all patches in each tinderbox run with this patch (once for each run)
without waiting for the tinderbox to return with a result. So we assume most of
those patches to be more innocent now (hoping the blame is on the dirtypatch).
The suspicous patch should now be back to the initial value:

 p-innocent(dirtypatch)=p-innocent(testcase)

The tinderbox will hopefully mark that patch as good or bad soon anyway and
remove it from the patches under consideration.

== advantages ==
This approach:
- Does not rely on the tinderboxes to ever come back with a result
  -- it should be robust against lost results.
- does not need to test each patch individually, if the average patch quality
  is not too bad
- requires only little bookkeeping on the side of the dispatcher
- should allow us to confidently mark all patches as 'doesnt break master for
  this testcase'

Opinions/Additions/Corrections? Objections? If not, we only need somebody to 
script
this ;)

Best,

Bjoern

P.S.: Dont show my careless use of 'propabilities' and such to the physics
department at the university where I got my degree. It will just result in
snorty laughs and cruel teasing.

(*) Conflicts might be rare though, so we might even get away with the
optimistic approach: just hoping that considered patches never conflict.Hi all,

this is a proposal to get as much focused tinderboxing as possible with limited
resources and unreliable build clients. This also assumes patches under
consideration to be independant (that is: without conflicts) and not dependant
on a specific order. gerrit allow us to have patches independant of order as
they are not yet merged/picked to the branch. We can also easily exclude any
patch on gerrit that conflicts against the existing patches under
consideration: To do so we cherry-pick the new patch on the tip of the branch
and the

[Libreoffice-commits] .: 3 commits - canvas/source cppcanvas/source drawinglayer/source filter/source padmin/source reportdesign/source sc/source sd/source sw/source vcl/inc vcl/source vcl/win vcl/wor

[Jan Holesovsky]

 canvas/source/cairo/cairo_canvashelper.cxx |4 
 cppcanvas/source/mtfrenderer/implrenderer.cxx  |   14 -
 drawinglayer/source/primitive2d/metafileprimitive2d.cxx|   12 -
 drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx |   26 +-
 filter/source/flash/swfwriter1.cxx |2 
 filter/source/svg/svgwriter.cxx|   20 -
 padmin/source/padialog.cxx |2 
 reportdesign/source/ui/report/EndMarker.cxx|2 
 reportdesign/source/ui/report/StartMarker.cxx  |2 
 sc/source/ui/cctrl/tbzoomsliderctrl.cxx|2 
 sc/source/ui/view/output.cxx   |2 
 sd/source/ui/annotations/annotationwindow.cxx  |6 
 sw/source/ui/docvw/AnnotationMenuButton.cxx|4 
 sw/source/ui/docvw/SidebarTxtControl.cxx   |4 
 vcl/inc/svdata.hxx |1 
 vcl/inc/vcl/gradient.hxx   |   12 -
 vcl/inc/vcl/vclenum.hxx|   26 --
 vcl/source/app/settings.cxx|2 
 vcl/source/gdi/gradient.cxx|   12 -
 vcl/source/gdi/outdev4.cxx |   10 
 vcl/source/gdi/wall.cxx|2 
 vcl/source/window/dockingarea.cxx  |   35 +--
 vcl/source/window/menu.cxx |2 
 vcl/source/window/toolbox.cxx  |2 
 vcl/source/window/window.cxx   |2 
 vcl/win/source/gdi/salnativewidgets-luna.cxx   |  151 ++---
 vcl/workben/outdevgrind.cxx|2 
 vcl/workben/svptest.cxx|2 
 28 files changed, 212 insertions(+), 151 deletions(-)

New commits:
commit f268355606630e9fc07a945859ec57ae00f6e427
Author: Jan Holesovsky 
Date:   Tue Jun 12 11:06:56 2012 +0200

toolbars: Improve the toolbars look in Windows Vista or later.

Change-Id: I389ef70c76a3a9c837ad5406c417804ad77be948

diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx
index 0da401f..1d951fd 100644
--- a/vcl/inc/svdata.hxx
+++ b/vcl/inc/svdata.hxx
@@ -308,6 +308,7 @@ struct ImplSVNWFData
 boolmbMenuBarDockingAreaCommonBG:1; // e.g. WinXP 
default theme
 boolmbDockingAreaSeparateTB:1;  // individual 
toolbar backgrounds
 // instead of one 
for docking area
+boolmbDockingAreaAvoidTBFrames:1;   //< don't draw 
frames around the individual toolbars if mbDockingAreaSeparateTB is false
 boolmbToolboxDropDownSeparate:1;// two adjacent 
buttons for
 // toolbox 
dropdown buttons
 boolmbFlatMenu:1;   // no popup 3D 
border
diff --git a/vcl/source/window/dockingarea.cxx 
b/vcl/source/window/dockingarea.cxx
index 31f29c2..a123ead 100644
--- a/vcl/source/window/dockingarea.cxx
+++ b/vcl/source/window/dockingarea.cxx
@@ -171,24 +171,27 @@ void DockingAreaWindow::Paint( const Rectangle& )
 DrawNativeControl( CTRL_TOOLBAR, IsHorizontal() ? 
PART_DRAW_BACKGROUND_HORZ : PART_DRAW_BACKGROUND_VERT,
aCtrlRegion, nState, aControlValue, 
rtl::OUString() );
 
-// each toolbar gets a thin border to better recognize its borders 
on the homogeneous docking area
-sal_uInt16 nChildren = GetChildCount();
-for( sal_uInt16 n = 0; n < nChildren; n++ )
+if( !ImplGetSVData()->maNWFData.mbDockingAreaAvoidTBFrames )
 {
-Window* pChild = GetChild( n );
-if ( pChild->IsVisible() )
+// each toolbar gets a thin border to better recognize its 
borders on the homogeneous docking area
+sal_uInt16 nChildren = GetChildCount();
+for( sal_uInt16 n = 0; n < nChildren; n++ )
 {
-Point aPos = pChild->GetPosPixel();
-Size aSize = pChild->GetSizePixel();
-Rectangle aRect( aPos, aSize );
-
-SetLineColor( 
GetSettings().GetStyleSettings().GetLightColor() );
-DrawLine( aRect.TopLeft(), aRect.TopRight() );
-DrawLine( aRect.TopLeft(), aRect.BottomLeft() );
-
-SetLineColor( 
GetSettings().GetStyleSettings().GetSeparatorColor() );
-DrawLine( aRect.BottomLeft(), aRect.BottomRight() );
-DrawLine( aRect.TopRight(), aRect.BottomRight() );
+Window* pChild = GetChild( n );
+if ( pChild->IsVisible() )
+   

PATCH: Add support for gnome-mail to send documents from file menu.

[Peter Tillemans]

made available under the MPL/LGPLv3+

Hi,

I originally posted this as a bug on launchpad,
https://bugs.launchpad.net/ubuntu/+source/libreoffice/+bug/1011735. I was
instructed to send the patch here instead. I also had to reassemble it a
bit as part of the original was also to stuff which was added downstream by
the debian packager.

This patch adds support for gnome-gmail as mail user agent for sending
documents from the filemenu. This was super easy since the gnome-gmail CLI
is modelled on the one from evolution.

the strange addition of "gnome" after "evolution" is because the basename
of the mailer is piped through sed to remove 'suffixes" from the name,
which also removes the "-gmail" part.

The patch is of course made available under the MPL/LGPLv3+


➜  core git:(master) ✗ git diff
diff --git a/shell/source/unix/misc/senddoc.sh
b/shell/source/unix/misc/senddoc
index a18562b..16f3660 100755
--- a/shell/source/unix/misc/senddoc.sh
+++ b/shell/source/unix/misc/senddoc.sh
@@ -208,7 +208,7 @@ case `basename "$MAILER" | sed 's/-.*$//'` in
 rm -f $BODY
 ;;

-evolution)
+evolution | gnome) # gnome-mail is shortened from the dash on

 while [ "$1" != "" ]; do
 case $1 in
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sw/source

[Michael Stahl]

 sw/source/filter/ww8/ww8graf.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit 2930a1abf8ba74d9bba0be808c1172ea7cd8e149
Author: Michael Stahl 
Date:   Tue Jun 12 15:40:45 2012 +0200

fdo#43249: WW8: fix double border import:

The border widths are tripled on import, because that is effectively
what SetWidth does for DOUBLE borders; set a divisor of 3 similar to
e2ffb71305c5f085eec6d396651c76d6daee3406
70a6a4d425558340bb49507975343a3e0a1bdde8

Change-Id: I40b175bedc1ed2d564be126bf9e6870b43474aba
(cherry picked from commit 36e43b52992735c622833e923faa63774b9e2f76)

Signed-off-by: Michael Stahl 

diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx
index 65431a5..084fc15 100644
--- a/sw/source/filter/ww8/ww8graf.cxx
+++ b/sw/source/filter/ww8/ww8graf.cxx
@@ -1570,6 +1570,10 @@ sal_Int32 
SwWW8ImplReader::MatchSdrBoxIntoFlyBoxItem(const Color& rLineColor,
 
 aLine.SetWidth( nLineThick ); // No conversion here, nLineThick is 
already in twips
 aLine.SetStyle( nIdx );
+if (editeng::DOUBLE == nIdx)
+{  // fdo#43249: divide width by 3 for outer line, gap, inner line
+   aLine.ScaleMetrics(1, 3);
+}
 
 for(sal_uInt16 nLine = 0; nLine < 4; ++nLine)
 rBox.SetLine(new SvxBorderLine( aLine ), nLine);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[REVIEW][3-5] fdo#43249: WW8: fix double border import regression

[Michael Stahl]

yet another import filter where double border widths are tripled, fix
proposed for libreoffice-3-5:

http://cgit.freedesktop.org/libreoffice/core/commit/?id=36e43b52992735c622833e923faa63774b9e2f76

i'm beginning to think this should really be solved in the SvxBorderLine
class as opposed to in every import filter...

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: sw/source

[Michael Stahl]

 sw/source/filter/ww8/ww8graf.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit 36e43b52992735c622833e923faa63774b9e2f76
Author: Michael Stahl 
Date:   Tue Jun 12 15:40:45 2012 +0200

fdo#43249: WW8: fix double border import:

The border widths are tripled on import, because that is effectively
what SetWidth does for DOUBLE borders; set a divisor of 3 similar to
e2ffb71305c5f085eec6d396651c76d6daee3406
70a6a4d425558340bb49507975343a3e0a1bdde8

Change-Id: I40b175bedc1ed2d564be126bf9e6870b43474aba

diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx
index 65431a5..084fc15 100644
--- a/sw/source/filter/ww8/ww8graf.cxx
+++ b/sw/source/filter/ww8/ww8graf.cxx
@@ -1570,6 +1570,10 @@ sal_Int32 
SwWW8ImplReader::MatchSdrBoxIntoFlyBoxItem(const Color& rLineColor,
 
 aLine.SetWidth( nLineThick ); // No conversion here, nLineThick is 
already in twips
 aLine.SetStyle( nIdx );
+if (editeng::DOUBLE == nIdx)
+{  // fdo#43249: divide width by 3 for outer line, gap, inner line
+   aLine.ScaleMetrics(1, 3);
+}
 
 for(sal_uInt16 nLine = 0; nLine < 4; ++nLine)
 rBox.SetLine(new SvxBorderLine( aLine ), nLine);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sw/source

[Norbert Thiebaud]

 sw/source/core/draw/dcontact.cxx |   14 --
 1 file changed, 12 insertions(+), 2 deletions(-)

New commits:
commit d10305bbcf98088ef3d72299e4a21de6e48f
Author: Norbert Thiebaud 
Date:   Tue Jun 12 08:38:11 2012 -0500

fix null pointer dereference

Change-Id: Ia117e1db43b29eda2f87bf1b1f26d580006e4b8b

diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx
index 998b167..a2e8e04 100644
--- a/sw/source/core/draw/dcontact.cxx
+++ b/sw/source/core/draw/dcontact.cxx
@@ -1320,6 +1320,13 @@ void SwDrawContact::_Changed( const SdrObject& rObj,
 // get instance  only once
 const SwAnchoredDrawObject* pAnchoredDrawObj =
 static_cast( GetAnchoredObj( 
&rObj ) );
+
+/* protect against NULL pointer dereferencing */
+if(!pAnchoredDrawObj)
+{
+break;
+}
+
 // OD 2004-04-06 #i26791# - adjust positioning and alignment 
attributes,
 // if positioning of drawing object isn't in progress.
 // #i53320# - no adjust of positioning attributes,
@@ -1432,8 +1439,11 @@ void SwDrawContact::_Changed( const SdrObject& rObj,
 // of as-character anchored object
 if ( bAnchoredAsChar )
 {
-const_cast(pAnchoredDrawObj)
-->AnchorFrm()->Prepare( PREP_FLY_ATTR_CHG, 
GetFmt() );
+SwFrm* pAnchorFrm = 
const_cast(pAnchoredDrawObj)->AnchorFrm();
+if(pAnchorFrm)
+{
+pAnchorFrm->Prepare( PREP_FLY_ATTR_CHG, GetFmt() );
+}
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - sw/source

[Philipp Weissenbacher]

 sw/source/core/tox/tox.cxx|   30 
 sw/source/core/tox/toxhlp.cxx |   12 +++---
 sw/source/core/tox/txmsrt.cxx |   70 +-
 sw/source/filter/ascii/ascatr.cxx |   18 -
 sw/source/filter/ascii/parasc.cxx |   37 +---
 sw/source/filter/ascii/wrtasc.cxx |   31 
 sw/source/filter/ascii/wrtasc.hxx |2 -
 7 files changed, 96 insertions(+), 104 deletions(-)

New commits:
commit ad68e47b740498a80c5802e167201f196c22
Author: Philipp Weissenbacher 
Date:   Tue Jun 12 15:18:03 2012 +0200

Translate German comments, fix some spelling errors

Change-Id: I2a4cc2c903f469898df9c739658ce25523199fbb

diff --git a/sw/source/filter/ascii/ascatr.cxx 
b/sw/source/filter/ascii/ascatr.cxx
index 9682ada..5ca0aa8 100644
--- a/sw/source/filter/ascii/ascatr.cxx
+++ b/sw/source/filter/ascii/ascatr.cxx
@@ -46,8 +46,8 @@
 #include 
 
 /*
- * Dieses File enthaelt alle Ausgabe-Funktionen des ASCII-Writers;
- * fuer alle Nodes, Attribute, Formate und Chars.
+ * This file contains all output functions of the ASCII-Writer;
+ * For all nodes, attributes, formats and chars.
  */
 
 class SwASC_AttrIter
@@ -82,9 +82,8 @@ xub_StrLen SwASC_AttrIter::SearchNext( xub_StrLen nStartPos )
 const SwpHints* pTxtAttrs = rNd.GetpSwpHints();
 if( pTxtAttrs )
 {
-// kann noch optimiert werden, wenn ausgenutzt wird, dass die TxtAttrs
-// nach der Anfangsposition geordnet sind. Dann muessten
-// allerdings noch 2 Indices gemerkt werden
+// TODO: This can be optimized, if we make use of the fact that the TxtAttrs
+// are sorted by starting position. We would need to remember two indices, 
however.
 for ( sal_uInt16 i = 0; i < pTxtAttrs->Count(); i++ )
 {
 const SwTxtAttr* pHt = (*pTxtAttrs)[i];
@@ -151,7 +150,7 @@ sal_Bool SwASC_AttrIter::OutAttr( xub_StrLen nSwPos )
 
 
 //
-/* Ausgabe der Nodes */
+// Output of the node
 //
 
 static Writer& OutASC_SwTxtNode( Writer& rWrt, SwCntntNode& rNode )
@@ -210,10 +209,9 @@ static Writer& OutASC_SwTxtNode( Writer& rWrt, 
SwCntntNode& rNode )
 }
 
 /*
- * lege hier jetzt die Tabellen fuer die ASCII-Funktions-Pointer auf
- * die Ausgabe-Funktionen an.
- * Es sind lokale Strukturen, die nur innerhalb der ASCII-DLL
- * bekannt sein muessen.
+ * Create the table for the ASCII function pointers to the output
+ * functon.
+ * There are local structures that only need to be known to the ASCII DLL.
  */
 
 SwNodeFnTab aASCNodeFnTab = {
diff --git a/sw/source/filter/ascii/parasc.cxx 
b/sw/source/filter/ascii/parasc.cxx
index 807f78b..40ff5d7 100644
--- a/sw/source/filter/ascii/parasc.cxx
+++ b/sw/source/filter/ascii/parasc.cxx
@@ -45,7 +45,7 @@
 #include 
 #include 
 #include 
-#include   // ResId fuer Statusleiste
+#include   // ResId for the status bar
 #include// ...Percent()
 #include 
 
@@ -77,17 +77,17 @@ public:
 };
 
 
-// Aufruf fuer die allg. Reader-Schnittstelle
+// Call for the general reader interface
 sal_uLong AsciiReader::Read( SwDoc &rDoc, const String&, SwPaM &rPam, const 
String & )
 {
 if( !pStrm )
 {
-OSL_ENSURE( !this, "ASCII-Read ohne Stream" );
+OSL_ENSURE( !this, "ASCII read without a stream" );
 return ERR_SWG_READ_ERROR;
 }
 
-// Alle Ueberschriften sind normalerweise ohne Kapitelnummer.
-// Darum hier explizit abschalten weil das Default jetzt wieder auf AN ist.
+// All headers normally do not have a chapter number.
+// We explicitly disable them here, because the default is set back to on.
 if( !bInsertMode )
 Reader::SetNoOutlineNum( rDoc );
 
@@ -145,7 +145,7 @@ SwASCIIParser::~SwASCIIParser()
 }
 
 
-// Aufruf des Parsers
+// Calling the parser
 sal_uLong SwASCIIParser::CallParser()
 {
 rInput.Seek(STREAM_SEEK_TO_END);
@@ -205,12 +205,12 @@ sal_uLong SwASCIIParser::CallParser()
 {
 // Using the pool defaults for the font causes significant
 // trouble for the HTML filter, because it is not able
-// to export the pool defaults (or to be more precice:
+// to export the pool defaults (or to be more precise:
 // the HTML filter is not able to detect whether a pool
 // default has changed or not. Even a comparison with the
 // HTMLi template does not work, because the defaults are
 // not copied when a new doc is created. The result of
-// comparing pool defaults therfor would be that the
+// comparing pool defaults therefor would be that the
 // defaults are exported always if the have changed for
 // text documents in general. That's not sensible, as well
 // as it is not sensible to export them always.
@@ -296,7 +296,7 @@ sal_u

Re: [GERRIT] gbuild migration: pyuno module

[Stephan Bergmann]

On 06/11/2012 12:17 AM, David Ostrovsky wrote:

Still have to test it on Windows and ask somebody to test it in MacosX.


Quick update:  Attached windows.patch allowed me to at least build 
 on Windows (on top of recent 
master).  "Tools - Macros - Organize Macros - Python... - LOdev Macros - 
HelloWord - HelloWOrdPython - Run" within Writer works, but executing 
...\program\python.exe does nothing.


Stephan
diff --git a/Repository.mk b/Repository.mk
old mode 100644
new mode 100755
index 6215bd8..4595421
--- a/Repository.mk
+++ b/Repository.mk
@@ -106,6 +106,7 @@ $(eval $(call gb_Helper_register_executables,OOO,\
 	odbcconfig \
 	officeloader \
 	python \
+	python_wrapper \
 	quickstart \
 	sbase \
 	scalc \
diff --git a/pyuno/CustomTarget_zipcore.mk b/pyuno/CustomTarget_zipcore.mk
old mode 100644
new mode 100755
index 0544d99..ba22084
--- a/pyuno/CustomTarget_zipcore.mk
+++ b/pyuno/CustomTarget_zipcore.mk
@@ -42,6 +42,6 @@ pyuno_zipcore_FINDLIBFILES:=\
 $(call gb_CustomTarget_get_workdir,pyuno/zipcore)/$(pyuno_PYTHON_ARCHIVE_NAME) : $(pyuno_zipcore_FINDLIBFILES) | \
 $(call gb_CustomTarget_get_workdir,pyuno/zipcore)/.dir
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ZIP,1)
-	cd $(OUTDIR)/lib/python && zip $@ $(shell $(FIND) . -type f | $(GREP) -v "\.pyc" | $(GREP) -v "\.py~" | $(GREP) -v .orig | $(GREP) -v _failed)
+	cd $(OUTDIR)/lib/python && zip $@ $(shell cd $(OUTDIR)/lib/python && $(FIND) . -type f | $(GREP) -v "\.pyc" | $(GREP) -v "\.py~" | $(GREP) -v .orig | $(GREP) -v _failed)
 
 # vim: set noet sw=4 ts=4:
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: I cannot register at Gerrit

[Bjoern Michaelsen]

On Tue, Jun 12, 2012 at 02:52:34PM +0200, Lionel Elie Mamane wrote:
> As the gerrit switchover is looming closer, could we please solve that?
> 
> After OpenID authentication, it says:
> 
>  Not Found
> 
>  The page you requested was not found.

@Robert: May I ask you to have a look at the apache logs to see if there is
anything suspicious going on there?

Best,

Bjoern
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Building and packaing OxygenOffice

[KAMI911 KAMI911]

Hi Folks,

I haven't built OxygenOffice from LibreOffice branches for several
months. Now I tried to do that (on 3-6) because I created two virtual
machines for they.

What is the best way to build & package OxygenOffice product? I saw
the PRODUCTNAME has set in configure.in:
configure.in:PRODUCTNAME=AC_PACKAGE_NAME

The packaging stage prints:
"
/usr/bin/perl -w /home/libo64/libo/solenv/bin/make_installer.pl -f
../util/openoffice.lst -l en-US -p LibreOffice_Dev -u ../unxlngx6.pro
-buildid 1 -msitemplate ../unxlngx6.pro/misc/openoffice/msi_templates
-msilanguage ../unxlngx6.pro/misc/win_ulffiles -format rpm
Subroutine installer::epmfile::getcwd redefined at
/home/libo64/libo/solenv/bin/modules/installer/epmfile.pm line 42
... checking environment variables ...
"

What is the best way to reenable the possibility of vuiling
OxygenOffice packages?

Thank you in advance!

Cheers,
KAMI
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

I cannot register at Gerrit

[Lionel Elie Mamane]

On Mon, Jun 04, 2012 at 10:20:14AM +0200, Lionel Elie Mamane wrote:
> On Mon, Jun 04, 2012 at 10:12:49AM +0200, Bjoern Michaelsen wrote:
>> On Sun, Jun 03, 2012 at 09:10:15PM +0200, Lionel Elie Mamane wrote:
>>> On Thu, May 17, 2012 at 05:41:52PM +0200, Bjoern Michaelsen wrote:

 1) login with OpenID(1) at gerrit.documentfoundation.org

>> please see Norberts correction it should be gerrit.libreoffice.org.

> Yes, I get the "not found" error _after_ authentication on
> gerrit.libreoffice.org. I get a gerrit page, with the header:
> 
>  All Documentation   Register  Sign in
>  Open  Merged  Abandoned __ Search
> 
> Then a page body of:
> 
>  Not Found
> 
>  The page you requested was not found.
> 
> Then the footer:
> 
>Press '?' to view keyboard shortcuts
>Powered by Gerrit Code Review (2.3) | Report Bug

As the gerrit switchover is looming closer, could we please solve that?

After OpenID authentication, it says:

 Not Found

 The page you requested was not found.

The URL of the page is
"https://gerrit.libreoffice.org/#SignInFailure,SIGN_IN,Discovered+information+verification+failed.";
I tried both "Register" and "Sign In". With register, same error
message but URL is
https://gerrit.libreoffice.org/#SignInFailure,REGISTER,Discovered+information+verification+failed.

I use my own-run local-openid proxied through Apache. Note I can
e.g. login to Wikitravel or slashdot.

-- 
Lionel
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

MySQL Native Connector broken for LOdev 3.6

[Fernand Vanrie]

As the MySQL Native Connector Extension is not supported by this 
community, filling a issue is not the point.


Sinds dev 3.6 the MySQL Native connector (for Windows) is broken , the 
Mysqlc.uno.dll can not been loaded during the extention installation , i 
suppose the extension code have to be recompiled against the latest LO 
code.
The extension was working well for LO 3.5 and (after some user data 
tweaking) also for OO 3.4
As this a huge handicap for all LO MySQL users i hope this minner 
compiling problem can been solved.

As i understood from Alex Thurhood,
"For something to happen on Windows, it would require someone with the
dedication and knowledge to build AOO on that OS, and to know how to
re-integrate the build of the connector back into the build tree
(make/config files), because my understanding is that it has been ripped
out, unless there is just some magical configure switch that lets you
turn it back on again. "
this can been done but needs some knowledge, ltime and machine power ? I 
lack the knowledge, time and machine can been deliverd


Hope someone can helps

Greetz

Fernand


___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - libvisio/libvisio-0.0.17.patch

[Petr Mladek]

 libvisio/libvisio-0.0.17.patch |   14 +-
 1 file changed, 13 insertions(+), 1 deletion(-)

New commits:
commit b3e0232e08f49824c9884e33d579646748f7f5f6
Author: Fridrich Å trba 
Date:   Tue Jun 12 14:35:02 2012 +0200

Don't push_back(.back()), stupid

Change-Id: I91ed2c018218c68665471be146dc82f9dbfd34ad
Signed-off-by: Petr Mladek 

diff --git a/libvisio/libvisio-0.0.17.patch b/libvisio/libvisio-0.0.17.patch
index c2b1309..e998634 100644
--- a/libvisio/libvisio-0.0.17.patch
+++ b/libvisio/libvisio-0.0.17.patch
@@ -1,6 +1,18 @@
 --- misc/libvisio-0.0.17/src/lib/VSDXContentCollector.cpp  2012-05-31 
15:14:42.0 +0200
 +++ misc/build/libvisio-0.0.17/src/lib/VSDXContentCollector.cpp
2012-06-09 00:08:24.139051461 +0200
-@@ -2059,7 +2059,11 @@
+@@ -1429,7 +1429,10 @@ void 
libvisio::VSDXContentCollector::collectNURBSTo(unsigned /* id */, unsigned
+ 
+   // Fill in end knots
+   while (knotVector.size() < (controlPoints.size() + degree + 2))
+-knotVector.push_back(knotVector.back());
++  {
++double tmpBack = knotVector.back();
++knotVector.push_back(tmpBack);
++  }
+ 
+   // Convert control points to static co-ordinates
+   for (std::vector >::iterator it = 
controlPoints.begin();
+@@ -2059,7 +2062,11 @@
  
  void libvisio::VSDXContentCollector::_convertDataToString(WPXString &result, 
const WPXBinaryData &data, TextFormat format)
  {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED-3-5]Re: [REVIEW-3-5] Re: [PUSHED][3-5] Re: [REVIEW-3-5] MSVC stl usage.

[Lubos Lunak]

On Tuesday 12 of June 2012, Michael Stahl wrote:
> i've fixed the other ones, please review and push to libreoffice-3-5:
>
> http://cgit.freedesktop.org/libreoffice/core/commit/?id=cd18b8e313b792f5fc4
>2edb3314a95d202406899

 Pushed.

On Tuesday 12 of June 2012, Michael Stahl wrote:
> On 12.06.2012 14:12, Tor Lillqvist wrote:
> >> No, growing a vector (which push_back can do) invalidates all references
> >> into the vector.
> >
> > Would building with --enable-dbgutil on Linux (thus defining
> > _GLIBCXX_DEBUG) had caught this problem?
>
> no, because there's no iterator involved: back() returns a reference to
> the value_type.

 It technically could, by checking in every method that can invalidate 
references that the passed argument is not such a reference (to one of the 
elements).

-- 
 Lubos Lunak
 l.lu...@suse.cz
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: sw/source

[Caolán McNamara]

 sw/source/filter/ww8/ww8par3.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8bee7215898d8784eb20bc43af1df3ed815288a6
Author: Caolán McNamara 
Date:   Tue Jun 12 13:39:45 2012 +0100

misuse of null-terminating requiring string ctor

Change-Id: Ib77d62d6bb9070877943cd686791c9e634718c79

diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx
index 357119b..6ffa47d 100644
--- a/sw/source/filter/ww8/ww8par3.cxx
+++ b/sw/source/filter/ww8/ww8par3.cxx
@@ -2429,7 +2429,7 @@ sal_Bool WW8FormulaListBox::Import(const uno::Reference <
 {
 0x2002,0x2002,0x2002,0x2002,0x2002
 };
-rSz = rRdr.MiserableDropDownFormHack(String(aBlank), xPropSet);
+rSz = rRdr.MiserableDropDownFormHack(rtl::OUString(aBlank, 
SAL_N_ELEMENTS(aBlank)), xPropSet);
 }
 
 return sal_True;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sdext/source xmloff/source

[Lubos Lunak]

 sdext/source/pdfimport/test/tests.cxx |3 ++-
 sdext/source/pdfimport/tree/pdfiprocessor.cxx |3 ++-
 xmloff/source/core/DomExport.cxx  |3 ++-
 xmloff/source/text/txtlists.cxx   |9 ++---
 4 files changed, 12 insertions(+), 6 deletions(-)

New commits:
commit e364ae3891415bbf0bca588f975b282b9822aca2
Author: Michael Stahl 
Date:   Tue Jun 12 14:13:22 2012 +0200

fix invalid vector.push_back(vector.back())

The vector::back() does not return a value but a reference, hence this
is invalid.

Change-Id: I8624b649deb8fb4de0d1d8af1288068acc80cef2

diff --git a/sdext/source/pdfimport/test/tests.cxx 
b/sdext/source/pdfimport/test/tests.cxx
index 0fd470e..e6d8fba 100644
--- a/sdext/source/pdfimport/test/tests.cxx
+++ b/sdext/source/pdfimport/test/tests.cxx
@@ -162,7 +162,8 @@ namespace
 
 virtual void pushState()
 {
-m_aGCStack.push_back( m_aGCStack.back() );
+GraphicsContextStack::value_type const a(m_aGCStack.back());
+m_aGCStack.push_back(a);
 }
 
 virtual void popState()
diff --git a/sdext/source/pdfimport/tree/pdfiprocessor.cxx 
b/sdext/source/pdfimport/tree/pdfiprocessor.cxx
index a800643..e96ce3d 100644
--- a/sdext/source/pdfimport/tree/pdfiprocessor.cxx
+++ b/sdext/source/pdfimport/tree/pdfiprocessor.cxx
@@ -116,7 +116,8 @@ void PDFIProcessor::setPageNum( sal_Int32 nPages )
 
 void PDFIProcessor::pushState()
 {
-m_aGCStack.push_back( m_aGCStack.back() );
+GraphicsContextStack::value_type const a(m_aGCStack.back());
+m_aGCStack.push_back(a);
 }
 
 void PDFIProcessor::popState()
diff --git a/xmloff/source/core/DomExport.cxx b/xmloff/source/core/DomExport.cxx
index cb9a4c9..c7cb7ff 100644
--- a/xmloff/source/core/DomExport.cxx
+++ b/xmloff/source/core/DomExport.cxx
@@ -196,7 +196,8 @@ DomExport::~DomExport()
 
 void DomExport::pushNamespace()
 {
-maNamespaces.push_back( maNamespaces.back() );
+SvXMLNamespaceMap const aMap(maNamespaces.back());
+maNamespaces.push_back(aMap);
 }
 
 void DomExport::popNamespace()
diff --git a/xmloff/source/text/txtlists.cxx b/xmloff/source/text/txtlists.cxx
index b615933..fa1c45b 100644
--- a/xmloff/source/text/txtlists.cxx
+++ b/xmloff/source/text/txtlists.cxx
@@ -412,12 +412,15 @@ XMLTextListsHelper::EnsureNumberedParagraph(
 if (static_cast(io_rLevel) + 1U > rNPList.size()) {
 // new level: need to enlarge
 for (size_t i = rNPList.size();
-i < static_cast(io_rLevel); ++i) {
-rNPList.push_back(rNPList.back());
+i < static_cast(io_rLevel); ++i)
+{
+NumParaList_t::value_type const rule(rNPList.back());
+rNPList.push_back(rule);
 }
+NumParaList_t::value_type const rule(rNPList.back());
 rNPList.push_back(xNumRules.is()
 ? ::std::make_pair(i_StyleName, xNumRules)
-: rNPList.back());
+: rule);
 } else {
 // old level: no need to enlarge; possibly shrink
 if (xNumRules.is()) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - basic/source comphelper/inc editeng/source svtools/source

[Caolán McNamara]

 basic/source/comp/scanner.cxx|5 ++---
 comphelper/inc/comphelper/string.hxx |3 ++-
 editeng/source/editeng/editdoc.cxx   |   16 +++-
 svtools/source/edit/textdoc.cxx  |2 +-
 4 files changed, 12 insertions(+), 14 deletions(-)

New commits:
commit 7d042c50f5b8e1d61f0615ae8aff5714840be01b
Author: Caolán McNamara 
Date:   Tue Jun 12 13:33:37 2012 +0100

use rtl_ustr_getLength instead of a temporary string just to find length

Change-Id: Ibbf777e57af6b98611cb5dce5a31517de80305b7

diff --git a/basic/source/comp/scanner.cxx b/basic/source/comp/scanner.cxx
index 6f7f0bd..cef84c9 100644
--- a/basic/source/comp/scanner.cxx
+++ b/basic/source/comp/scanner.cxx
@@ -433,8 +433,7 @@ bool SbiScanner::NextSym()
 // from 4.1.1996: buffer full, go on scanning empty
 if( (p-buf) == (BUF_SIZE-1) )
 bBufOverflow = true;
-else if( String( cmp ).Search( ch ) != STRING_NOTFOUND )
-//else if( strchr( cmp, ch ) )
+else if( rtl::OUString( cmp ).indexOf( ch ) != -1 )
 *p++ = ch;
 else
 {
@@ -522,7 +521,7 @@ PrevLineCommentLbl:
 {
 bPrevLineExtentsComment = false;
 aSym = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("REM"));
-sal_Int32 nLen = String( pLine ).Len();
+sal_Int32 nLen = rtl_ustr_getLength(pLine);
 if( bCompatible && pLine[ nLen - 1 ] == '_' && pLine[ nLen - 2 ] == ' 
' )
 bPrevLineExtentsComment = true;
 nCol2 = nCol2 + nLen;
diff --git a/svtools/source/edit/textdoc.cxx b/svtools/source/edit/textdoc.cxx
index 5ca9997..a8062ec 100644
--- a/svtools/source/edit/textdoc.cxx
+++ b/svtools/source/edit/textdoc.cxx
@@ -553,7 +553,7 @@ sal_uLong TextDoc::GetTextLen( const xub_Unicode* pSep, 
const TextSelection* pSe
 }
 
 if ( pSep )
-nLen += (nEndNode-nStartNode) * String( pSep ).Len();
+nLen += (nEndNode-nStartNode) * rtl_ustr_getLength(pSep);
 }
 
 return nLen;
commit df4c929bc36c168a55c3467c783fd0256b90dc45
Author: Caolán McNamara 
Date:   Tue Jun 12 09:51:38 2012 +0100

don't need to realloc string

Change-Id: I17ec5a54b0088b56bd8c8431eb255626dbb1fac8

diff --git a/comphelper/inc/comphelper/string.hxx 
b/comphelper/inc/comphelper/string.hxx
index 8a763e8..9088327 100644
--- a/comphelper/inc/comphelper/string.hxx
+++ b/comphelper/inc/comphelper/string.hxx
@@ -49,7 +49,8 @@ namespace comphelper { namespace string {
 /** Allocate a new string containing space for a given number of characters.
 
 The reference count of the new string will be 1. The length of the string
-will be nLen. This function does not handle out-of-memory conditions.
+will be nLen. This function throws std::bad_alloc on out-of-memory
+conditions.
 
 The characters of the capacity are not cleared, and the length is set to
 nLen, unlike the similar method of rtl_uString_new_WithLength which
diff --git a/editeng/source/editeng/editdoc.cxx 
b/editeng/source/editeng/editdoc.cxx
index 110daf5..fe747c3 100644
--- a/editeng/source/editeng/editdoc.cxx
+++ b/editeng/source/editeng/editdoc.cxx
@@ -26,7 +26,7 @@
  *
  /
 
-
+#include 
 #include 
 #include 
 #include 
@@ -2037,7 +2037,7 @@ XubString EditDoc::GetText( LineEnd eEnd ) const
 sal_uLong nLen = GetTextLen();
 size_t nNodes = Count();
 if (nNodes == 0)
-return String();
+return rtl::OUString();
 
 rtl::OUString aSep = EditDoc::GetSepStr( eEnd );
 sal_Int32 nSepSize = aSep.getLength();
@@ -2047,10 +2047,11 @@ XubString EditDoc::GetText( LineEnd eEnd ) const
 if ( nLen > 0xFFFb / sizeof(xub_Unicode) )
 {
 OSL_FAIL( "Text too large for String" );
-return String();
+return rtl::OUString();
 }
-xub_Unicode* pStr = new xub_Unicode[nLen+1];
-xub_Unicode* pCur = pStr;
+
+rtl_uString* newStr = comphelper::string::rtl_uString_alloc(nLen);
+xub_Unicode* pCur = newStr->buffer;
 size_t nLastNode = nNodes-1;
 for ( sal_uInt16 nNode = 0; nNode < nNodes; nNode++ )
 {
@@ -2063,10 +2064,7 @@ XubString EditDoc::GetText( LineEnd eEnd ) const
 pCur += nSepSize;
 }
 }
-*pCur = '\0';
-String aASCIIText( pStr );
-delete[] pStr;
-return aASCIIText;
+return rtl::OUString(newStr, SAL_NO_ACQUIRE);
 }
 
 XubString EditDoc::GetParaAsString( sal_uInt16 nNode ) const
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [REVIEW] Muthu's patches for pptx import fixes

[Petr Mladek]

Hi Korrawit,

I forgot to comment the last sentence ;-)

On Mon, 2012-06-11 at 22:35 +0700, Korrawit Pruegsanusak wrote:

> If I shouldn't do this proposal in the future, please feel free to tell. :-)

It is perfectly fine and welcome that you look for important fixes and
propose them for review. Authors of the fixes are sometimes busy and
forget to do it.

Of course, we need to stay in limits. The review cost some resources
that might be spend on fixing other bugs. So, it is not worth to review
everything.

Also, I would prefer if the changes are nominated earlier before
tagging, so there is not a press for review. Maybe, I should send the
reminder earlier ;-)

Anyway, great catches and work.


Best Regards,
Petr

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - libvisio/libvisio-0.0.17.patch

[Fridrich Strba]

 libvisio/libvisio-0.0.17.patch |   14 +-
 1 file changed, 13 insertions(+), 1 deletion(-)

New commits:
commit 2251e2185a6133904760fc34649ea72be170ef70
Author: Fridrich Å trba 
Date:   Tue Jun 12 14:35:02 2012 +0200

Don't push_back(.back()), stupid

Change-Id: I91ed2c018218c68665471be146dc82f9dbfd34ad
Signed-off-by: Fridrich Å trba 

diff --git a/libvisio/libvisio-0.0.17.patch b/libvisio/libvisio-0.0.17.patch
index c2b1309..e998634 100644
--- a/libvisio/libvisio-0.0.17.patch
+++ b/libvisio/libvisio-0.0.17.patch
@@ -1,6 +1,18 @@
 --- misc/libvisio-0.0.17/src/lib/VSDXContentCollector.cpp  2012-05-31 
15:14:42.0 +0200
 +++ misc/build/libvisio-0.0.17/src/lib/VSDXContentCollector.cpp
2012-06-09 00:08:24.139051461 +0200
-@@ -2059,7 +2059,11 @@
+@@ -1429,7 +1429,10 @@ void 
libvisio::VSDXContentCollector::collectNURBSTo(unsigned /* id */, unsigned
+ 
+   // Fill in end knots
+   while (knotVector.size() < (controlPoints.size() + degree + 2))
+-knotVector.push_back(knotVector.back());
++  {
++double tmpBack = knotVector.back();
++knotVector.push_back(tmpBack);
++  }
+ 
+   // Convert control points to static co-ordinates
+   for (std::vector >::iterator it = 
controlPoints.begin();
+@@ -2059,7 +2062,11 @@
  
  void libvisio::VSDXContentCollector::_convertDataToString(WPXString &result, 
const WPXBinaryData &data, TextFormat format)
  {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: libvisio/libvisio-0.0.17.patch

[Fridrich Strba]

 libvisio/libvisio-0.0.17.patch |   14 +-
 1 file changed, 13 insertions(+), 1 deletion(-)

New commits:
commit 17ebc5540e3f80b04d38ba2000a1db96822874f6
Author: Fridrich Å trba 
Date:   Tue Jun 12 14:35:02 2012 +0200

Don't push_back(.back()), stupid

Change-Id: I91ed2c018218c68665471be146dc82f9dbfd34ad

diff --git a/libvisio/libvisio-0.0.17.patch b/libvisio/libvisio-0.0.17.patch
index c2b1309..e998634 100644
--- a/libvisio/libvisio-0.0.17.patch
+++ b/libvisio/libvisio-0.0.17.patch
@@ -1,6 +1,18 @@
 --- misc/libvisio-0.0.17/src/lib/VSDXContentCollector.cpp  2012-05-31 
15:14:42.0 +0200
 +++ misc/build/libvisio-0.0.17/src/lib/VSDXContentCollector.cpp
2012-06-09 00:08:24.139051461 +0200
-@@ -2059,7 +2059,11 @@
+@@ -1429,7 +1429,10 @@ void 
libvisio::VSDXContentCollector::collectNURBSTo(unsigned /* id */, unsigned
+ 
+   // Fill in end knots
+   while (knotVector.size() < (controlPoints.size() + degree + 2))
+-knotVector.push_back(knotVector.back());
++  {
++double tmpBack = knotVector.back();
++knotVector.push_back(tmpBack);
++  }
+ 
+   // Convert control points to static co-ordinates
+   for (std::vector >::iterator it = 
controlPoints.begin();
+@@ -2059,7 +2062,11 @@
  
  void libvisio::VSDXContentCollector::_convertDataToString(WPXString &result, 
const WPXBinaryData &data, TextFormat format)
  {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [PUSHED:3-5] Muthu's patches for pptx import fixes

[Petr Mladek]

On Mon, 2012-06-11 at 22:35 +0700, Korrawit Pruegsanusak wrote:
> Hello Muthu, all,
> 
> I'd like to propose two Muthu's patches to include in stable branch as follow:
> 
> * 
> http://cgit.freedesktop.org/libreoffice/core/commit/?id=90352e5f1e50291960c944f9a1f44ab3e91d6503
> This also fixed long-standing fdo#35372 and its duplicate fdo#37311,
> although there is still a problem in fdo#46594, but it's an
> improvement and I think it's better than nothing.
> This should go to only -3-5 branch because it's pushed before -3-6 branching.

The patch improves the situation, looks reasonable. It affects only the
import, so it looks quite safe => pushed into 3-5 branch.

> * 
> http://cgit.freedesktop.org/libreoffice/core/commit/?id=25dd603fe2044f35341fe0c6d0b632c9295a824e
> This also fixed fdo#49806 and its duplicates fdo#49808 and fdo#50283.
> Although official build didn't suffer from this bug, but daily builds
> did.
> This should go to -3-5 and -3-6 branch.

This one is handled in another thread, see
http://lists.freedesktop.org/archives/libreoffice/2012-June/033296.html

Best Regards,
Petr

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [PUSHED][3-5] Re: [REVIEW-3-5] MSVC stl usage.

[Michael Stahl]

On 12.06.2012 14:12, Tor Lillqvist wrote:
>> No, growing a vector (which push_back can do) invalidates all references
>> into the vector.
> 
> Would building with --enable-dbgutil on Linux (thus defining
> _GLIBCXX_DEBUG) had caught this problem?

no, because there's no iterator involved: back() returns a reference to
the value_type.

> If yes, they I certainly start agreeing with you (IIRC) that
> developers should use --enable-dbgutil.

despite not helping here, _GLIBCXX_DEBUG finds sufficiently many
problems already that i think it's definitely worth using.

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - oox/inc oox/source

[Petr Mladek]

 oox/inc/oox/drawingml/shape.hxx   |2 +-
 oox/inc/oox/ppt/pptshape.hxx  |2 +-
 oox/source/drawingml/shape.cxx|4 ++--
 oox/source/ppt/pptgraphicshapecontext.cxx |8 ++--
 oox/source/ppt/pptshape.cxx   |6 +++---
 5 files changed, 13 insertions(+), 9 deletions(-)

New commits:
commit 1f68d8f644e5b961cd44c549b2dd18176bec6ccd
Author: Muthu Subramanian 
Date:   Tue May 8 13:03:38 2012 +0530

n759212: Text over images.

Default text may not make sense to be copied from the
master slide to the slides when there is an image.

Signed-off-by: Petr Mladek 

diff --git a/oox/inc/oox/drawingml/shape.hxx b/oox/inc/oox/drawingml/shape.hxx
index 772f699..51ddc89 100644
--- a/oox/inc/oox/drawingml/shape.hxx
+++ b/oox/inc/oox/drawingml/shape.hxx
@@ -173,7 +173,7 @@ public:
 const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape 
> &
 getXShape() const { return mxShape; }
 
-virtual voidapplyShapeReference( const Shape& rReferencedShape );
+virtual voidapplyShapeReference( const Shape& rReferencedShape, 
bool bUseText = true );
 const ::std::vector&
 getExtDrawings() { return maExtDrawings; }
 voidaddExtDrawingRelId( const ::rtl::OUString &rRelId ) { 
maExtDrawings.push_back( rRelId ); }
diff --git a/oox/inc/oox/ppt/pptshape.hxx b/oox/inc/oox/ppt/pptshape.hxx
index e06fda6..e5552f2 100644
--- a/oox/inc/oox/ppt/pptshape.hxx
+++ b/oox/inc/oox/ppt/pptshape.hxx
@@ -57,7 +57,7 @@ public:
 const com::sun::star::awt::Rectangle* pShapeRect = 0,
 ::oox::drawingml::ShapeIdMap* pShapeMap = 0 );
 
-virtual void applyShapeReference( const oox::drawingml::Shape& 
rReferencedShape );
+virtual void applyShapeReference( const oox::drawingml::Shape& 
rReferencedShape, bool bUseText = true );
 
 void setShapeLocation( const oox::ppt::ShapeLocation eShapeLocation ) { 
meShapeLocation = eShapeLocation; };
 ShapeLocation getShapeLocation() const { return meShapeLocation; };
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index f551b85..102ea91 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -234,11 +234,11 @@ void Shape::addShape(
 }
 }
 
-void Shape::applyShapeReference( const Shape& rReferencedShape )
+void Shape::applyShapeReference( const Shape& rReferencedShape, bool bUseText )
 {
 OSL_TRACE("apply shape reference: %s to shape id: %s", 
rtl::OUStringToOString(rReferencedShape.msId, RTL_TEXTENCODING_UTF8 ).getStr(), 
rtl::OUStringToOString(msId, RTL_TEXTENCODING_UTF8 ).getStr());
 
-if ( rReferencedShape.mpTextBody.get() )
+if ( rReferencedShape.mpTextBody.get() && bUseText )
 mpTextBody = TextBodyPtr( new TextBody( 
*rReferencedShape.mpTextBody.get() ) );
 else
 mpTextBody.reset();
diff --git a/oox/source/ppt/pptgraphicshapecontext.cxx 
b/oox/source/ppt/pptgraphicshapecontext.cxx
index dd5820a..9efa3e3 100644
--- a/oox/source/ppt/pptgraphicshapecontext.cxx
+++ b/oox/source/ppt/pptgraphicshapecontext.cxx
@@ -198,10 +198,14 @@ Reference< XFastContextHandler > 
PPTGraphicShapeContext::createFastChildContext(
 }
 if ( pPlaceholder.get() )
 {
-mpShapePtr->applyShapeReference( *pPlaceholder.get() );
+bool bUseText = true;
+// TODO: Check if pPlaceholder->getSubType is none (i.e. 
none explicitly specified)
+if( pPlaceholder->getSubType() == XML_obj )
+bUseText = false;
+mpShapePtr->applyShapeReference( *pPlaceholder.get(), 
bUseText );
 PPTShape* pPPTShape = dynamic_cast< PPTShape* >( 
pPlaceholder.get() );
 if ( pPPTShape )
-pPPTShape->setReferenced( sal_True );
+pPPTShape->setReferenced( sal_True );
 pPPTShapePtr->setPlaceholder( pPlaceholder );
 }
 }
diff --git a/oox/source/ppt/pptshape.cxx b/oox/source/ppt/pptshape.cxx
index e7a0a41..2066629 100644
--- a/oox/source/ppt/pptshape.cxx
+++ b/oox/source/ppt/pptshape.cxx
@@ -318,7 +318,7 @@ void PPTShape::addShape(
 aCombinedTextListStyle->apply( *aMasterTextListStyle.get() );
 
 if( mpPlaceholder.get() && mpPlaceholder->getTextBody().get() )
-aCombinedTextListStyle->apply( 
mpPlaceholder->getTextBody()->getTextListStyle() );
+aCombinedTextListStyle->apply( 
mpPlaceholder->getTextBody()->getTextListStyle() );
 aCombinedTextListStyle->apply( 
getTextBody()->getTextListStyle() );
 
 setMasterTextListStyle( aCombinedTextListStyle );
@@ -361,9 +361,9 @@ void PPTShape::addShape(
 }
 }
 
-void PPTShape::applyShapeReference( const oox::drawingml::Shape& 
rReferen

[REVIEW-3-5] Re: [PUSHED][3-5] Re: [REVIEW-3-5] MSVC stl usage.

[Michael Stahl]

On 12.06.2012 13:54, Stephan Bergmann wrote:
> On 06/12/2012 01:32 PM, Michael Stahl wrote:
>> On 12.06.2012 13:14, Muthu Subramanian K wrote:
>>> Can somebody review and cherry-pick this one please?
>>> http://cgit.freedesktop.org/libreoffice/core/commit/?id=25dd603fe2044f35341fe0c6d0b632c9295a824e
>>
>> hmm... that old code looks legit to me?
> 
> No, growing a vector (which push_back can do) invalidates all references 
> into the vector.

ah, back() returns a reference, not a value?
then of course it was wrong.

hmm... grep finds some more occurrences of this...

> sc/source/filter/html/htmlpars.cxx:rSizes.push_back( rSizes.empty() ? 
> 1 : (rSizes.back() + 1) );

this one can't go wrong because has to dereferences before calling
push_back.

i've fixed the other ones, please review and push to libreoffice-3-5:

http://cgit.freedesktop.org/libreoffice/core/commit/?id=cd18b8e313b792f5fc42edb3314a95d202406899

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sdext/source xmloff/source

[Michael Stahl]

 sdext/source/pdfimport/test/tests.cxx |3 ++-
 sdext/source/pdfimport/tree/pdfiprocessor.cxx |3 ++-
 xmloff/source/core/DomExport.cxx  |3 ++-
 xmloff/source/text/txtlists.cxx   |9 ++---
 4 files changed, 12 insertions(+), 6 deletions(-)

New commits:
commit 73d3edc46e49411750294e203131cef3f6570210
Author: Michael Stahl 
Date:   Tue Jun 12 14:13:22 2012 +0200

fix invalid vector.push_back(vector.back())

The vector::back() does not return a value but a reference, hence this
is invalid.

Change-Id: I8624b649deb8fb4de0d1d8af1288068acc80cef2
(cherry picked from commit cd18b8e313b792f5fc42edb3314a95d202406899)

Signed-off-by: Michael Stahl 

diff --git a/sdext/source/pdfimport/test/tests.cxx 
b/sdext/source/pdfimport/test/tests.cxx
index c00d72e..60a2c7e 100644
--- a/sdext/source/pdfimport/test/tests.cxx
+++ b/sdext/source/pdfimport/test/tests.cxx
@@ -175,7 +175,8 @@ namespace
 
 virtual void pushState()
 {
-m_aGCStack.push_back( m_aGCStack.back() );
+GraphicsContextStack::value_type const a(m_aGCStack.back());
+m_aGCStack.push_back(a);
 }
 
 virtual void popState()
diff --git a/sdext/source/pdfimport/tree/pdfiprocessor.cxx 
b/sdext/source/pdfimport/tree/pdfiprocessor.cxx
index 9d066b9..1024803 100644
--- a/sdext/source/pdfimport/tree/pdfiprocessor.cxx
+++ b/sdext/source/pdfimport/tree/pdfiprocessor.cxx
@@ -116,7 +116,8 @@ void PDFIProcessor::setPageNum( sal_Int32 nPages )
 
 void PDFIProcessor::pushState()
 {
-m_aGCStack.push_back( m_aGCStack.back() );
+GraphicsContextStack::value_type const a(m_aGCStack.back());
+m_aGCStack.push_back(a);
 }
 
 void PDFIProcessor::popState()
diff --git a/xmloff/source/core/DomExport.cxx b/xmloff/source/core/DomExport.cxx
index eff5c49..3f5c7af 100644
--- a/xmloff/source/core/DomExport.cxx
+++ b/xmloff/source/core/DomExport.cxx
@@ -196,7 +196,8 @@ DomExport::~DomExport()
 
 void DomExport::pushNamespace()
 {
-maNamespaces.push_back( maNamespaces.back() );
+SvXMLNamespaceMap const aMap(maNamespaces.back());
+maNamespaces.push_back(aMap);
 }
 
 void DomExport::popNamespace()
diff --git a/xmloff/source/text/txtlists.cxx b/xmloff/source/text/txtlists.cxx
index f4d20c6..b6d3666 100644
--- a/xmloff/source/text/txtlists.cxx
+++ b/xmloff/source/text/txtlists.cxx
@@ -412,12 +412,15 @@ XMLTextListsHelper::EnsureNumberedParagraph(
 if (static_cast(io_rLevel) + 1U > rNPList.size()) {
 // new level: need to enlarge
 for (size_t i = rNPList.size();
-i < static_cast(io_rLevel); ++i) {
-rNPList.push_back(rNPList.back());
+i < static_cast(io_rLevel); ++i)
+{
+NumParaList_t::value_type const rule(rNPList.back());
+rNPList.push_back(rule);
 }
+NumParaList_t::value_type const rule(rNPList.back());
 rNPList.push_back(xNumRules.is()
 ? ::std::make_pair(i_StyleName, xNumRules)
-: rNPList.back());
+: rule);
 } else {
 // old level: no need to enlarge; possibly shrink
 if (xNumRules.is()) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sdext/source xmloff/source

[Michael Stahl]

 sdext/source/pdfimport/test/tests.cxx |3 ++-
 sdext/source/pdfimport/tree/pdfiprocessor.cxx |3 ++-
 xmloff/source/core/DomExport.cxx  |3 ++-
 xmloff/source/text/txtlists.cxx   |9 ++---
 4 files changed, 12 insertions(+), 6 deletions(-)

New commits:
commit cd18b8e313b792f5fc42edb3314a95d202406899
Author: Michael Stahl 
Date:   Tue Jun 12 14:13:22 2012 +0200

fix invalid vector.push_back(vector.back())

The vector::back() does not return a value but a reference, hence this
is invalid.

Change-Id: I8624b649deb8fb4de0d1d8af1288068acc80cef2

diff --git a/sdext/source/pdfimport/test/tests.cxx 
b/sdext/source/pdfimport/test/tests.cxx
index c00d72e..60a2c7e 100644
--- a/sdext/source/pdfimport/test/tests.cxx
+++ b/sdext/source/pdfimport/test/tests.cxx
@@ -175,7 +175,8 @@ namespace
 
 virtual void pushState()
 {
-m_aGCStack.push_back( m_aGCStack.back() );
+GraphicsContextStack::value_type const a(m_aGCStack.back());
+m_aGCStack.push_back(a);
 }
 
 virtual void popState()
diff --git a/sdext/source/pdfimport/tree/pdfiprocessor.cxx 
b/sdext/source/pdfimport/tree/pdfiprocessor.cxx
index 9d066b9..1024803 100644
--- a/sdext/source/pdfimport/tree/pdfiprocessor.cxx
+++ b/sdext/source/pdfimport/tree/pdfiprocessor.cxx
@@ -116,7 +116,8 @@ void PDFIProcessor::setPageNum( sal_Int32 nPages )
 
 void PDFIProcessor::pushState()
 {
-m_aGCStack.push_back( m_aGCStack.back() );
+GraphicsContextStack::value_type const a(m_aGCStack.back());
+m_aGCStack.push_back(a);
 }
 
 void PDFIProcessor::popState()
diff --git a/xmloff/source/core/DomExport.cxx b/xmloff/source/core/DomExport.cxx
index eff5c49..3f5c7af 100644
--- a/xmloff/source/core/DomExport.cxx
+++ b/xmloff/source/core/DomExport.cxx
@@ -196,7 +196,8 @@ DomExport::~DomExport()
 
 void DomExport::pushNamespace()
 {
-maNamespaces.push_back( maNamespaces.back() );
+SvXMLNamespaceMap const aMap(maNamespaces.back());
+maNamespaces.push_back(aMap);
 }
 
 void DomExport::popNamespace()
diff --git a/xmloff/source/text/txtlists.cxx b/xmloff/source/text/txtlists.cxx
index f4d20c6..b6d3666 100644
--- a/xmloff/source/text/txtlists.cxx
+++ b/xmloff/source/text/txtlists.cxx
@@ -412,12 +412,15 @@ XMLTextListsHelper::EnsureNumberedParagraph(
 if (static_cast(io_rLevel) + 1U > rNPList.size()) {
 // new level: need to enlarge
 for (size_t i = rNPList.size();
-i < static_cast(io_rLevel); ++i) {
-rNPList.push_back(rNPList.back());
+i < static_cast(io_rLevel); ++i)
+{
+NumParaList_t::value_type const rule(rNPList.back());
+rNPList.push_back(rule);
 }
+NumParaList_t::value_type const rule(rNPList.back());
 rNPList.push_back(xNumRules.is()
 ? ::std::make_pair(i_StyleName, xNumRules)
-: rNPList.back());
+: rule);
 } else {
 // old level: no need to enlarge; possibly shrink
 if (xNumRules.is()) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [PUSHED][3-5] Re: [REVIEW-3-5] MSVC stl usage.

[Tor Lillqvist]

> No, growing a vector (which push_back can do) invalidates all references
> into the vector.

Would building with --enable-dbgutil on Linux (thus defining
_GLIBCXX_DEBUG) had caught this problem?

If yes, they I certainly start agreeing with you (IIRC) that
developers should use --enable-dbgutil.

--tml
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] .: Branch 'feature/cmclayout' - 2 commits - sw/source vcl/source

[Caolán McNamara]

 sw/source/ui/misc/outline.hrc |4 ++--
 vcl/source/window/builder.cxx |8 
 2 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 125cecd8fa6036986f1d442bc7d902b547c11e75
Author: Caolán McNamara 
Date:   Tue Jun 12 13:07:20 2012 +0100

FT_CHARFMT and LB_CHARFMT shared the same resource id

diff --git a/sw/source/ui/misc/outline.hrc b/sw/source/ui/misc/outline.hrc
index 2f8a4a4..17dd319 100644
--- a/sw/source/ui/misc/outline.hrc
+++ b/sw/source/ui/misc/outline.hrc
@@ -84,7 +84,7 @@
 #define MN_FORM9119
 #define MN_SAVE 120
 
-#define FL_LEVEL130
+#define FL_LEVEL130
 #define LB_LEVEL131
 #define WIN_PREVIEW 132
 #define FT_SUFFIX   134
@@ -95,4 +95,4 @@
 
 #define ST_FORM 140
 #define FT_CHARFMT  141
-#define LB_CHARFMT  141
+#define LB_CHARFMT  142
commit 2e304c8d65a6a286a78074e40b7d66777cfe3cc3
Author: Caolán McNamara 
Date:   Tue Jun 12 13:05:14 2012 +0100

import placeholders as empty pages for tabcontrols

diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 4877ebd..563322b 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -368,12 +368,12 @@ void VclBuilder::handleTabChild(Window *pParent, 
xmlreader::XmlReader &reader)
 break;
 }
 
+TabControl *pTabControl = static_cast(pParent);
 VclBuilder::stringmap::iterator aFind = 
aProperties.find(rtl::OString(RTL_CONSTASCII_STRINGPARAM("label")));
 if (aFind != aProperties.end())
-{
-TabControl *pTabControl = static_cast(pParent);
 pTabControl->SetPageText(pTabControl->GetCurPageId(), 
rtl::OStringToOUString(aFind->second, RTL_TEXTENCODING_UTF8));
-}
+else
+pTabControl->RemovePage(pTabControl->GetCurPageId());
 }
 
 void VclBuilder::handleChild(Window *pParent, xmlreader::XmlReader &reader)
@@ -407,7 +407,7 @@ void VclBuilder::handleChild(Window *pParent, 
xmlreader::XmlReader &reader)
 
 if (res == xmlreader::XmlReader::RESULT_BEGIN)
 {
-if (name.equals(RTL_CONSTASCII_STRINGPARAM("object")))
+if (name.equals(RTL_CONSTASCII_STRINGPARAM("object")) || 
name.equals(RTL_CONSTASCII_STRINGPARAM("placeholder")))
 {
 pCurrentChild = handleObject(pParent, reader);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: oox/inc

[Miklos Vajna]

 oox/inc/oox/vml/vmltextbox.hxx |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 48da4027d0745deb3389885e903e9323b353c4d4
Author: Miklos Vajna 
Date:   Tue Jun 12 14:06:06 2012 +0200

oox: fix TextFontModel doxygen comments

Change-Id: I0f869af4fd497461fc06897540d3be0a6703f00e

diff --git a/oox/inc/oox/vml/vmltextbox.hxx b/oox/inc/oox/vml/vmltextbox.hxx
index cc2e41b..67c9615 100644
--- a/oox/inc/oox/vml/vmltextbox.hxx
+++ b/oox/inc/oox/vml/vmltextbox.hxx
@@ -42,11 +42,11 @@ namespace vml {
 /** Font settings for a text portion in a textbox. */
 struct OOX_DLLPUBLIC TextFontModel
 {
-OptValue< ::rtl::OUString > moName; /// Font name.
-OptValue< ::rtl::OUString > moColor;/// Font color, HTML encoded, sort 
of.
-OptValue< sal_Int32 > monSize;  /// Font size in twips.
-OptValue< sal_Int32 > monUnderline; /// Single or double underline.
-OptValue< sal_Int32 > monEscapement;/// Subscript or superscript.
+OptValue< ::rtl::OUString > moName; ///< Font name.
+OptValue< ::rtl::OUString > moColor;///< Font color, HTML encoded, 
sort of.
+OptValue< sal_Int32 > monSize;  ///< Font size in twips.
+OptValue< sal_Int32 > monUnderline; ///< Single or double underline.
+OptValue< sal_Int32 > monEscapement;///< Subscript or superscript.
 OptValue< bool >mobBold;
 OptValue< bool >mobItalic;
 OptValue< bool >mobStrikeout;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits