date:20150830

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - vcl/win

2015-08-30 Thread Michael Meeks

 vcl/win/source/gdi/winlayout.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 44befc2dfcbffc338b65362ae734219556deb823
Author: Michael Meeks 
Date:   Mon Aug 31 07:30:00 2015 +0100

WaE: remove unused parameter.

Change-Id: Idd7ec17eed51f79ead56349bb644945826d0a695

diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx
index aab2f10..f262724 100644
--- a/vcl/win/source/gdi/winlayout.cxx
+++ b/vcl/win/source/gdi/winlayout.cxx
@@ -119,7 +119,7 @@ char ColorFor(COLORREF aColor)
 return '0' + (10*(GetRValue(aColor) + GetGValue(aColor) + 
GetBValue(aColor))) / (0xFF*3);
 }
 
-void DumpGlyphBitmap(OpenGLGlyphCacheChunk& rChunk, HDC hDC)
+void DumpGlyphBitmap(OpenGLGlyphCacheChunk&, HDC hDC)
 {
 HBITMAP hBitmap = static_cast(GetCurrentObject(hDC, OBJ_BITMAP));
 if (hBitmap == NULL)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 6 commits - external/libabw external/libcdr external/libmwaw external/libodfgen external/libvisio external/libwps

2015-08-30 Thread David Ostrovsky

Hi David,

On Sun Aug 30 09:30:28 PDT 2015, David Tardon wrote:

[...]
>
>libcdr: fix build with boost 1.59
>
>Change-Id: Ie12338eae161f0a13fa4ff036e41d389bc0d616a
>
>diff --git a/external/libcdr/ExternalProject_libcdr.mk
>b/external/libcdr/ExternalProject_libcdr.mk
>index e4d7c9b..96930fe 100644
>--- a/external/libcdr/ExternalProject_libcdr.mk
>+++ b/external/libcdr/ExternalProject_libcdr.mk
>@@ -36,7 +36,8 @@ $(call
>gb_ExternalProject_get_state_target,libcdr,build) :
>   --disable-werror \
>   --disable-weffc \
>   $(if 
> $(verbose),--disable-silent-rules,--enable-silent-rules) \
>-  CXXFLAGS="$(if 
>$(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call
gb_UnpackedTarball_get_dir,boost))" \
>+  CXXFLAGS="$(if 
>$(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call
gb_UnpackedTarball_get_dir,boost)) \
>+  -DBOOST_ERROR_CODE_HEADER_ONLY 
>-DBOOST_SYSTEM_NO_DEPRECATED" \
>   $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) 
> --host=
$(HOST_PLATFORM)) \
[...]

I assume this was needed to support building external libraries against
system boost? There was a change between 1.59-rc1 and 1.59 final in
include of error_code.hpp, so that deprecated vars and functions are 
now exposed.

I tried to reverse the logic and patched boost by using  #ifdef
BOOST_SYSTEM_DEPRECATED instead in this patch [1] but this cannot work
against vanilla system boost 1.59 final.

Am I right in assuming that the plan would be to drop the patch
boost_1_59_0.system.no.deprecated.patch and use the same approach and
define -DBOOST_SYSTEM_NO_DEPRECATED?

Is -DBOOST_ERROR_CODE_HEADER_ONLY really needed here? In fact, with the
patch [1] applied, LO was linking without issue.

Thanks
David

[1] https://svn.boost.org/trac/boost/ticket/11597

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

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sal/qa

2015-08-30 Thread Damjan Jovanovic

 sal/qa/rtl/uri/makefile.mk |   39 ++
 sal/qa/rtl/uri/rtl_Uri.cxx |  197 ++-
 sal/qa/rtl/uri/rtl_testuri.cxx |  260 +
 3 files changed, 225 insertions(+), 271 deletions(-)

New commits:
commit 33abd0564a8a62d8452892d43906c02ef57553ee
Author: Damjan Jovanovic 
Date:   Mon Aug 31 02:16:25 2015 +

#i125003# migrate main/sal/qa/rtl/uri from cppunit to Google Test.

diff --git a/sal/qa/rtl/uri/makefile.mk b/sal/qa/rtl/uri/makefile.mk
index 78b0c01..30021d6 100644
--- a/sal/qa/rtl/uri/makefile.mk
+++ b/sal/qa/rtl/uri/makefile.mk
@@ -32,40 +32,37 @@ ENABLE_EXCEPTIONS=TRUE
 
 .INCLUDE :  settings.mk
 
+.IF "$(ENABLE_UNIT_TESTS)" != "YES"
+all:
+@echo unit tests are disabled. Nothing to do.
+ 
+.ELSE
+
 CFLAGS+= $(LFS_CFLAGS)
 CXXFLAGS+= $(LFS_CFLAGS)
 
-CFLAGSCXX += $(CPPUNIT_CFLAGS)
-
 # --- BEGIN 
-SHL1OBJS=  \
+APP1OBJS=  \
 $(SLO)$/rtl_Uri.obj
-SHL1TARGET= rtl_uri_simple
-SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
-
-SHL1IMPLIB= i$(SHL1TARGET)
-DEF1NAME=$(SHL1TARGET)
-SHL1VERSIONMAP = $(PRJ)$/qa$/export.map
+APP1TARGET= rtl_uri_simple
+APP1STDLIBS= $(SALLIB) $(GTESTLIB) $(TESTSHL2LIB)
+APP1RPATH = NONE
+APP1TEST = enabled
 
 # END --
 
 # --- BEGIN 
-SHL2OBJS=  \
+APP2OBJS=  \
 $(SLO)$/rtl_testuri.obj
-SHL2TARGET= rtl_Uri
-SHL2STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
-
-SHL2IMPLIB= i$(SHL2TARGET)
-DEF2NAME=$(SHL2TARGET)
-SHL2VERSIONMAP = $(PRJ)$/qa$/export.map
+APP2TARGET= rtl_Uri
+APP2STDLIBS= $(SALLIB) $(GTESTLIB) $(TESTSHL2LIB)
+APP2RPATH = NONE
+APP2TEST = enabled
 
 # END --
 
-#--- All object files 
---
-# do this here, so we get right dependencies
-# SLOFILES=$(SHL1OBJS)
-
 # --- Targets --
 
 .INCLUDE :  target.mk
-.INCLUDE : _cppunit.mk
+
+.ENDIF # "$(ENABLE_UNIT_TESTS)" != "YES"
diff --git a/sal/qa/rtl/uri/rtl_Uri.cxx b/sal/qa/rtl/uri/rtl_Uri.cxx
index 41a4c39..6ef2a0a 100644
--- a/sal/qa/rtl/uri/rtl_Uri.cxx
+++ b/sal/qa/rtl/uri/rtl_Uri.cxx
@@ -31,7 +31,7 @@
 #include 
 #include 
 
-#include 
+#include "gtest/gtest.h"
 
 // 
-
 
@@ -71,15 +71,16 @@ namespace Stringtest
 
 // 
-
 
-class Convert : public CppUnit::TestFixture
+class Convert : public ::testing::Test
 {
+protected:
 rtl::OUString m_aStr;
 public:
 /*
   rtl::OString toUTF8(rtl::OUString const& _suStr)
 {
 rtl::OString sStrAsUTF8 = rtl::OUStringToOString(_suStr, 
RTL_TEXTENCODING_UTF8);
-t_print("%s\n", escapeString(sStrAsUTF8).getStr());
+printf("%s\n", escapeString(sStrAsUTF8).getStr());
 return sStrAsUTF8;
 }
 */
@@ -97,7 +98,7 @@ namespace Stringtest
 void showContent(rtl::OUString const& _suStr)
 {
 rtl::OString sStr = convertToOString(_suStr);
-t_print("%s\n", sStr.getStr());
+printf("%s\n", sStr.getStr());
 }
 
 void toUTF8_mech(rtl::OUString const& _suStr, rtl_UriEncodeMechanism 
_eMechanism)
@@ -123,39 +124,15 @@ namespace Stringtest
 
 void toUTF8(rtl::OUString const& _suStr)
 {
-t_print("rtl_UriEncodeIgnoreEscapes \n");
+printf("rtl_UriEncodeIgnoreEscapes \n");
 toUTF8_mech(_suStr, rtl_UriEncodeIgnoreEscapes);
-t_print("\n");
-t_print("# rtl_UriEncodeKeepEscapes\n");
+printf("\n");
+printf("# rtl_UriEncodeKeepEscapes\n");
 toUTF8_mech(_suStr, rtl_UriEncodeKeepEscapes);
-t_print("\n");
-t_print("# rtl_UriEncodeCheckEscapes\n");
+printf("\n");
+printf("# rtl_UriEncodeCheckEscapes\n");
 toUTF8_mech(_suStr, rtl_UriEncodeCheckEscapes);
-t_print("\n");
-}
-
-void test_FromUTF8_001()
-{
-// string --> ustring
-rtl::OString sStrUTF8("h%C3%A4llo");
-rtl::OUString suStrUTF8 = rtl::OStringToOUString(sStrUTF8, 
RTL_TEXTENCODING_ASCII_US);
-
-// UTF8 --> real ustring
-rtl::OUString suStr_UriDecodeToIuri  = 
rtl::Uri::decode(suStrUTF8, rtl_UriDecodeToIuri, RTL_TEXTENCODING_UTF8);
-showContent(suStr_UriDecodeToIuri);
-
-// string --> ustring
-rtl::OString sStr("h\xE4llo");
-rtl::OUString suStrin

graphite 1.3.1 released

2015-08-30 Thread Martin Hosken

Dear All,

OK so 1.3.0 wasn't the best release. Please can someone upload the 
graphite2-1.3.1.tgz to the libreoffice source server and feel free to delete 
1.3.0 given it hasn't been used in any master code.

TIA,
Yours,
Martin.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - filter/source sd/qa

2015-08-30 Thread Caolán McNamara

 filter/source/msfilter/svdfppt.cxx   |2 +-
 sd/qa/unit/data/ppt/pass/crash-3.ppt |binary
 2 files changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7ee90f9e1109129461d618d3faa0c3be555ad328
Author: CaolÃ¡n McNamara 
Date:   Sun Aug 30 20:14:16 2015 +0100

pClientData can be null

Change-Id: I9375f84affdaef30d9b1ded31525e6b7b8709cbc
(cherry picked from commit 7d4c77e374310bef538465d11980d1d610cbe0f1)
Reviewed-on: https://gerrit.libreoffice.org/18149
Tested-by: Jenkins 
Reviewed-by: Norbert Thiebaud 

diff --git a/filter/source/msfilter/svdfppt.cxx 
b/filter/source/msfilter/svdfppt.cxx
index 42f8b1b..d952684 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -2587,7 +2587,7 @@ bool SdrPowerPointImport::GetColorFromPalette( sal_uInt16 
nNum, Color& rColor )
 bool SdrPowerPointImport::SeekToShape( SvStream& rSt, void* pClientData, 
sal_uInt32 nId ) const
 {
 bool bRet = SvxMSDffManager::SeekToShape( rSt, pClientData, nId );
-if ( !bRet )
+if (!bRet && pClientData)
 {
 ProcessData& rData = *static_cast(pClientData);
 PptSlidePersistEntry& rPersistEntry = rData.rPersistEntry;
diff --git a/sd/qa/unit/data/ppt/pass/crash-3.ppt 
b/sd/qa/unit/data/ppt/pass/crash-3.ppt
new file mode 100644
index 000..daa0102
Binary files /dev/null and b/sd/qa/unit/data/ppt/pass/crash-3.ppt differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: editeng/source svtools/source xmloff/source

2015-08-30 Thread Mark Hung

 editeng/source/rtf/svxrtf.cxx|8 +++-
 svtools/source/svrtf/parrtf.cxx  |   21 +++--
 xmloff/source/style/styleexp.cxx |4 
 3 files changed, 30 insertions(+), 3 deletions(-)

New commits:
commit 0955bfed86e55f823fb9686f52dbffc36558b5d5
Author: Mark Hung 
Date:   Sun Aug 30 16:08:20 2015 +0800

Fix tdf#93438 Impress generate abnormal style when copy-pasting

from Writer with Chinese UI. When user configure UI language as
Chinese, style names are also translated. However when Copy-pasting
from Writer to Impress ( select RTF fromat with paste-special),
Chinese (unicode) style names are borken into multiparts, where
some of them are empty string. Neither deleting the abnormal
style nor saving the file can be achieved. The only remedy is to
remove style with emtpy name with macro. With this patch:
1) Catch NoSuchElementException and ignores it, so
   user still has chance saving file.
2) Make sure style has valid number before inserting it.
3) Prevent text breaking into multiple tokens by handling  ucN in
 ScanText().

Change-Id: I417f70b81c23ac63c175cc13c548068873d13a38
Reviewed-on: https://gerrit.libreoffice.org/18148
Tested-by: Jenkins 
Reviewed-by: Norbert Thiebaud 

diff --git a/editeng/source/rtf/svxrtf.cxx b/editeng/source/rtf/svxrtf.cxx
index a027bf6..0d10e23 100644
--- a/editeng/source/rtf/svxrtf.cxx
+++ b/editeng/source/rtf/svxrtf.cxx
@@ -299,6 +299,7 @@ void SvxRTFParser::ReadStyleTable()
 {
 int nToken, bSaveChkStyleAttr = bChkStyleAttr ? 1 : 0;
 sal_uInt16 nStyleNo = 0;
+bool bHasStyleNo = false;
 int _nOpenBrakets = 1;  // the first was already detected earlier!!
 ::std::unique_ptr pStyle(
 new SvxRTFStyleType( *pAttrPool, &aWhichMap[0] ));
@@ -340,12 +341,16 @@ void SvxRTFParser::ReadStyleTable()
 case RTF_SNEXT: pStyle->nNext = sal_uInt16(nTokenValue);break;
 case RTF_OUTLINELEVEL:
 case RTF_SOUTLVL:   pStyle->nOutlineNo = sal_uInt8(nTokenValue);
break;
-case RTF_S: nStyleNo = (short)nTokenValue;  break;
+case RTF_S: nStyleNo = (short)nTokenValue;
+bHasStyleNo = true;
+break;
 case RTF_CS:nStyleNo = (short)nTokenValue;
+bHasStyleNo = true;
 pStyle->bIsCharFmt = true;
 break;
 
 case RTF_TEXTTOKEN:
+if (bHasStyleNo)
 {
 pStyle->sName = DelCharAtEnd( aToken, ';' );
 
@@ -358,6 +363,7 @@ void SvxRTFParser::ReadStyleTable()
 pStyle.reset(new SvxRTFStyleType( *pAttrPool, &aWhichMap[0] ));
 pStyle->aAttrSet.Put( GetRTFDefaults() );
 nStyleNo = 0;
+bHasStyleNo = false;
 }
 break;
 default:
diff --git a/svtools/source/svrtf/parrtf.cxx b/svtools/source/svrtf/parrtf.cxx
index 4254a71..7216a4f 100644
--- a/svtools/source/svrtf/parrtf.cxx
+++ b/svtools/source/svrtf/parrtf.cxx
@@ -431,6 +431,24 @@ void SvRTFParser::ScanText( const sal_Unicode cBreak )
 aToken = sSave;
 bRTF_InTextRead = false;
 }
+else if ( 'c' == nNextCh )
+{
+// Prevent text breaking into multiple tokens.
+rInput.SeekRel( 2 );
+nNextCh = GetNextChar();
+if (RTF_ISDIGIT( nNextCh ))
+{
+sal_uInt8 nNewOverread = 0 ;
+do {
+nNewOverread *= 10;
+nNewOverread += nNextCh - '0';
+nNextCh = GetNextChar();
+} while ( RTF_ISDIGIT( nNextCh ) );
+nUCharOverread = nNewOverread;
+aParserStates.top().nUCharOverread = 
nNewOverread;
+}
+bNextCh = 0x20 == nNextCh;
+}
 else
 {
 nNextCh = '\\';
@@ -448,8 +466,7 @@ void SvRTFParser::ScanText( const sal_Unicode cBreak )
 }
 break;
 
-case sal_Unicode(EOF):
-eState = SVPAR_ERROR;
+case sal_Unicode(EOF): eState = SVPAR_ERROR;
 // continue
 case '{':
 case '}':
diff --git a/xmloff/source/style/styleexp.cxx b/xmloff/source/style/styleexp.cxx
index 0ab12cc..8ca89b6 100644
--- a/xmloff/source/style/styleexp.cxx
+++ b/xmloff/source/style/styleexp.cxx
@@ -419,6 +419,10 @@ void XMLStyleExport::exportStyleFamily(
 // not export th

[Libreoffice-commits] core.git: icon-themes/sifr

2015-08-30 Thread Yousuf Philips

 icon-themes/sifr/cmd/sc_linearrowsquare.png |binary
 icon-themes/sifr/links.txt  |   11 +++
 2 files changed, 11 insertions(+)

New commits:
commit 30211d1edf2487816fa6bcc0187e61651f60
Author: Yousuf Philips 
Date:   Sun Aug 30 11:05:58 2015 +0400

SIFR: Fix insert row and column icons and correct arrowsquare icon

Change-Id: I49352d85378fa45a07c8ccd402f17e3178e6dabc
Reviewed-on: https://gerrit.libreoffice.org/18139
Reviewed-by: Yousuf Philips 
Tested-by: Yousuf Philips 

diff --git a/icon-themes/sifr/cmd/sc_linearrowsquare.png 
b/icon-themes/sifr/cmd/sc_linearrowsquare.png
index cddd75b..3db36b0 100644
Binary files a/icon-themes/sifr/cmd/sc_linearrowsquare.png and 
b/icon-themes/sifr/cmd/sc_linearrowsquare.png differ
diff --git a/icon-themes/sifr/links.txt b/icon-themes/sifr/links.txt
index 7f23e02..0601ff8 100644
--- a/icon-themes/sifr/links.txt
+++ b/icon-themes/sifr/links.txt
@@ -88,3 +88,14 @@ cmd/sc_datafilterautofilter.png cmd/sc_autofilter.png
 # text background colour Impress/Draw
 cmd/sc_charbackcolor.png cmd/sc_backcolor.png
 cmd/lc_charbackcolor.png cmd/lc_backcolor.png
+
+# insert rows and columns
+cmd/lc_insertrowsbefore.png cmd/lc_insertrows.png
+cmd/sc_insertrowsbefore.png cmd/sc_insertrows.png
+cmd/lc_insertcolumnsbefore.png cmd/lc_insertcolumns.png
+cmd/sc_insertcolumnsbefore.png cmd/sc_insertcolumns.png
+cmd/lc_insertrowsafter.png cmd/lc_insertrows.png
+cmd/sc_insertrowsafter.png cmd/sc_insertrows.png
+cmd/lc_insertcolumnsafter.png cmd/lc_insertcolumns.png
+cmd/sc_insertcolumnsafter.png cmd/sc_insertcolumns.png
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sal/cppunittester solenv/gbuild

2015-08-30 Thread Markus Mohrhard

 sal/cppunittester/cppunittester.cxx |   50 
 solenv/gbuild/CppunitTest.mk|2 -
 2 files changed, 51 insertions(+), 1 deletion(-)

New commits:
commit 87514b0907dfbb479e2646b5ff951c68babf3417
Author: Markus Mohrhard 
Date:   Mon Aug 31 01:36:02 2015 +0200

log resource usage of unit tests on UNX platforms

Change-Id: I3788eae60f73bc42488bf2e4961922962f7e505b
Reviewed-on: https://gerrit.libreoffice.org/18155
Reviewed-by: Markus Mohrhard 
Tested-by: Markus Mohrhard 

diff --git a/sal/cppunittester/cppunittester.cxx 
b/sal/cppunittester/cppunittester.cxx
index 07c9a2b..79ba18d 100644
--- a/sal/cppunittester/cppunittester.cxx
+++ b/sal/cppunittester/cppunittester.cxx
@@ -21,6 +21,11 @@
 #include 
 #endif
 
+#ifdef UNX
+#include 
+#include 
+#endif
+
 #include 
 #include 
 #include 
@@ -292,11 +297,48 @@ public:
 }
 };
 
+#ifdef UNX
+
+double get_time(timeval* time)
+{
+double nTime = (double)time->tv_sec;
+nTime += ((double)time->tv_usec)/100.0;
+return nTime;
+}
+
+OString generateTestName(const OUString& rPath)
+{
+sal_Int32 nPathSep = rPath.lastIndexOf("/");
+OUString aTestName = rPath.copy(nPathSep+1);
+return OUStringToOString(aTestName, RTL_TEXTENCODING_UTF8);
+}
+
+void reportResourceUsage(const OUString& rPath)
+{
+OUString aFullPath = rPath + OUString(".resource.log");
+rusage resource_usage;
+getrusage(RUSAGE_SELF, &resource_usage);
+
+OString aPath = OUStringToOString(aFullPath, RTL_TEXTENCODING_UTF8);
+std::ofstream resource_file(aPath.getStr());
+resource_file << "Name = " << generateTestName(rPath) << std::endl;
+double nUserSpace = get_time(&resource_usage.ru_utime);
+double nKernelSpace = get_time(&resource_usage.ru_stime);
+resource_file << "UserSpace = " << nUserSpace << std::endl;
+resource_file << "KernelSpace = " << nKernelSpace << std::endl;
+}
+#else
+void reportResourceUsage(const OUString& /*rPath*/)
+{
+}
+#endif
+
 }
 
 SAL_IMPLEMENT_MAIN()
 {
 bool ok = false;
+OUString path;
 try
 {
 #ifdef WNT
@@ -322,6 +364,12 @@ SAL_IMPLEMENT_MAIN()
 while (index < rtl_getAppCommandArgCount())
 {
 rtl::OUString arg = getArgument(index);
+if (arg == "--target")
+{
+path = getArgument(++index);
+++index;
+continue;
+}
 if ( arg != "--protector" )
 {
 if (testlib.empty())
@@ -383,6 +431,8 @@ SAL_IMPLEMENT_MAIN()
 SAL_WARN("vcl.app", "Fatal exception: " << e.what());
 }
 
+reportResourceUsage(path);
+
 return ok ? EXIT_SUCCESS : EXIT_FAILURE;
 }
 
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index 61f17dd..bea33eb 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -102,7 +102,7 @@ $(call gb_CppunitTest_get_target,%) :| 
$(gb_CppunitTest_RUNTIMEDEPS)
PYTHONDONTWRITEBYTECODE=1) \
$(ICECREAM_RUN) $(gb_CppunitTest_GDBTRACE) 
$(gb_CppunitTest_VALGRINDTOOL) $(gb_CppunitTest_CPPTESTCOMMAND) \
$(call gb_LinkTarget_get_target,$(call 
gb_CppunitTest_get_linktarget,$*)) \
-   $(call gb_CppunitTest__make_args) \
+   $(call gb_CppunitTest__make_args) --target $@ \
$(if $(gb_CppunitTest__interactive),, \
> $@.log 2>&1 \
|| ($(if $(value gb_CppunitTest_postprocess), \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sd/source

2015-08-30 Thread Maxim Monastirsky

 sd/source/ui/slidesorter/controller/SlsSlotManager.cxx |3 ++-
 sd/source/ui/table/tablefunction.cxx   |4 ++--
 sd/source/ui/view/ViewShellImplementation.cxx  |4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

New commits:
commit c511b2795dbf47186c0f7d83fe7a4cd737d4d765
Author: Maxim Monastirsky 
Date:   Mon Aug 31 00:30:16 2015 +0300

sd: Don't crash when the sidebar is hidden

Change-Id: I09a5019a98b529ba11f07392906a3e0fb7bc1bac

diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx 
b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
index a5eef4c..5a32041 100644
--- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
@@ -179,7 +179,8 @@ void SlotManager::FuTemporary (SfxRequest& rRequest)
 
 case SID_SLIDE_TRANSITIONS_PANEL:
 {
-// Make the slide transition panel visible in the sidebar.
+// First make sure that the sidebar is visible
+pShell->GetViewFrame()->ShowChildWindow(SID_SIDEBAR);
 ::sfx2::sidebar::Sidebar::ShowPanel(
 OUString("SlideTransitionPanel"),
 pShell->GetViewFrame()->GetFrame().GetFrameInterface());
diff --git a/sd/source/ui/table/tablefunction.cxx 
b/sd/source/ui/table/tablefunction.cxx
index 857f932..d032fd4 100644
--- a/sd/source/ui/table/tablefunction.cxx
+++ b/sd/source/ui/table/tablefunction.cxx
@@ -206,8 +206,8 @@ void DrawViewShell::FuTable(SfxRequest& rReq)
 }
 else
 {
-// Make the table design panel visible (expand it) in the
-// sidebar.
+// First make sure that the sidebar is visible
+GetViewFrame()->ShowChildWindow(SID_SIDEBAR);
 ::sfx2::sidebar::Sidebar::ShowPanel(
 OUString("ImpressTableDesignPanel"),
 GetViewFrame()->GetFrame().GetFrameInterface());
diff --git a/sd/source/ui/view/ViewShellImplementation.cxx 
b/sd/source/ui/view/ViewShellImplementation.cxx
index 40a6689..a0c1905 100644
--- a/sd/source/ui/view/ViewShellImplementation.cxx
+++ b/sd/source/ui/view/ViewShellImplementation.cxx
@@ -119,8 +119,8 @@ void ViewShell::Implementation::ProcessModifyPageSlot (
 
 if (!pArgs || pArgs->Count() == 1 || pArgs->Count() == 2 )
 {
-
-// Make the layout menu visible in the tool pane.
+// First make sure that the sidebar is visible
+mrViewShell.GetViewFrame()->ShowChildWindow(SID_SIDEBAR);
 sfx2::sidebar::Sidebar::ShowPanel(
 OUString("ImpressLayoutsPanel"),
 mrViewShell.GetViewFrame()->GetFrame().GetFrameInterface());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sc/source

2015-08-30 Thread Katarina Behrens

 sc/source/ui/condformat/condformatdlgentry.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b7d877c4c18000e4d4653a7858e5b1578a73bef5
Author: Katarina Behrens 
Date:   Sat Aug 29 17:12:42 2015 +0200

tdf#93600: Avoid crash on entering '=' as a cell value

To match formulas, 'formula is' condition should be used instead

Change-Id: I37a9a2680c49bffcb8b25a11faedc1421cfa2d00
Reviewed-on: https://gerrit.libreoffice.org/18126
Tested-by: Jenkins 
Reviewed-by: Markus Mohrhard 
Tested-by: Markus Mohrhard 

diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx 
b/sc/source/ui/condformat/condformatdlgentry.cxx
index 7785c0d..cee9abc 100644
--- a/sc/source/ui/condformat/condformatdlgentry.cxx
+++ b/sc/source/ui/condformat/condformatdlgentry.cxx
@@ -311,7 +311,7 @@ IMPL_LINK(ScConditionFrmtEntry, OnEdChanged, Edit*, pEdit)
 boost::scoped_ptr ta(aComp.CompileString(aFormula));
 
 // Error, warn the user
-if( ta->GetCodeError() )
+if( ta->GetCodeError() || ( ta->GetLen() == 0 ) )
 {
 pEdit->SetControlBackground(COL_LIGHTRED);
 maFtVal->SetText(ScGlobal::GetRscString(STR_VALID_DEFERROR));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: o3tl/qa

2015-08-30 Thread Stephan Bergmann

 o3tl/qa/cow_wrapper_clients.cxx |4 ++--
 o3tl/qa/cow_wrapper_clients.hxx |4 ++--
 o3tl/qa/test-cow_wrapper.cxx|   26 +-
 3 files changed, 17 insertions(+), 17 deletions(-)

New commits:
commit c952516a2821dd7077691e88ebcb7cba36aae97a
Author: Stephan Bergmann 
Date:   Sun Aug 30 22:40:08 2015 +0200

loplugin:implicitboolconversion

Change-Id: Id4561abb96ee8244d4c0b0c9dfce0e2cab1d8b85

diff --git a/o3tl/qa/cow_wrapper_clients.cxx b/o3tl/qa/cow_wrapper_clients.cxx
index 3cea257..82c73f1 100644
--- a/o3tl/qa/cow_wrapper_clients.cxx
+++ b/o3tl/qa/cow_wrapper_clients.cxx
@@ -219,8 +219,8 @@ bool cow_wrapper_client4::operator<( const 
cow_wrapper_client4& rRHS ) const
 return maImpl < rRHS.maImpl;
 }
 
-bool BogusRefCountPolicy::s_bShouldIncrement = 0;
-bool BogusRefCountPolicy::s_bShouldDecrement = 0;
+bool BogusRefCountPolicy::s_bShouldIncrement = false;
+bool BogusRefCountPolicy::s_bShouldDecrement = false;
 sal_uInt32 BogusRefCountPolicy::s_nEndOfScope = 0;
 
 cow_wrapper_client5::cow_wrapper_client5() :
diff --git a/o3tl/qa/cow_wrapper_clients.hxx b/o3tl/qa/cow_wrapper_clients.hxx
index f438c06..8ca04f8 100644
--- a/o3tl/qa/cow_wrapper_clients.hxx
+++ b/o3tl/qa/cow_wrapper_clients.hxx
@@ -152,7 +152,7 @@ struct BogusRefCountPolicy
 if(s_bShouldIncrement)
 {
 ++rCount;
-s_bShouldIncrement = 0;
+s_bShouldIncrement = false;
 }
 else
 CPPUNIT_FAIL("Ref-counting policy incremented when it should not 
have.");
@@ -167,7 +167,7 @@ struct BogusRefCountPolicy
 if(s_bShouldDecrement)
 {
 --rCount;
-s_bShouldDecrement = 0;
+s_bShouldDecrement = false;
 }
 else
 CPPUNIT_FAIL("Ref-counting policy decremented when it should not 
have.");
diff --git a/o3tl/qa/test-cow_wrapper.cxx b/o3tl/qa/test-cow_wrapper.cxx
index 7100355..7c61da6 100644
--- a/o3tl/qa/test-cow_wrapper.cxx
+++ b/o3tl/qa/test-cow_wrapper.cxx
@@ -174,23 +174,23 @@ public:
aTestObj2.use_count() == 1 );
 
 // the following should increment
-BogusRefCountPolicy::s_bShouldIncrement = 1;
+BogusRefCountPolicy::s_bShouldIncrement = true;
 cow_wrapper_client5 aTestObj3( aTestObj2 );
 CPPUNIT_ASSERT_MESSAGE("s_bShouldIncrement == 0",
-   BogusRefCountPolicy::s_bShouldIncrement == 
0 );
+   !BogusRefCountPolicy::s_bShouldIncrement );
 
 CPPUNIT_ASSERT_MESSAGE("aTestObj3.use_count() == 2",
aTestObj3.use_count() == 2 );
 {
 cow_wrapper_client5 aTestObj4;
 // the following should decrement the lvalue and then 
increment the rvalue
-BogusRefCountPolicy::s_bShouldIncrement = 1;
-BogusRefCountPolicy::s_bShouldDecrement = 1;
+BogusRefCountPolicy::s_bShouldIncrement = true;
+BogusRefCountPolicy::s_bShouldDecrement = true;
 aTestObj4 = aTestObj2;
 CPPUNIT_ASSERT_MESSAGE("s_bShouldIncrement == 0",
-   BogusRefCountPolicy::s_bShouldIncrement 
== 0 );
+   
!BogusRefCountPolicy::s_bShouldIncrement );
 CPPUNIT_ASSERT_MESSAGE("s_bShouldDecrement == 0",
-   BogusRefCountPolicy::s_bShouldDecrement 
== 0 );
+   
!BogusRefCountPolicy::s_bShouldDecrement );
 
 CPPUNIT_ASSERT_MESSAGE("aTestObj2.use_count() == 3",
aTestObj2.use_count() == 3 );
@@ -206,21 +206,21 @@ public:
aTestObj2 == aTestObj4 );
 
 // only decrement the lvalue before assignment
-BogusRefCountPolicy::s_bShouldDecrement = 1;
+BogusRefCountPolicy::s_bShouldDecrement = true;
 aTestObj4 = cow_wrapper_client5( 4 );
 CPPUNIT_ASSERT_MESSAGE("s_bShouldIncrement == 0",
-   BogusRefCountPolicy::s_bShouldIncrement 
== 0 );
+   
!BogusRefCountPolicy::s_bShouldIncrement );
 
 // only one call should be made to the ref counting policy's
 // decrementing function at the end of the scope
-BogusRefCountPolicy::s_bShouldDecrement = 1;
+BogusRefCountPolicy::s_bShouldDecrement = true;
 }
 CPPUNIT_ASSERT_MESSAGE("s_bShouldDecrement == 0",
-   BogusRefCountPolicy::s_bShouldDecrement == 
0 );
+   !BogusRefCountPolicy::s_bShouldDecrement );
 
 // self assignment
 // aTestObj2 is defunct afterwards, one decrement happens

[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - sd/qa sd/source

2015-08-30 Thread Caolán McNamara

 sd/qa/unit/data/ppt/pass/hang-21.ppt |binary
 sd/source/filter/ppt/propread.cxx|8 
 2 files changed, 8 insertions(+)

New commits:
commit 32e6e25accebad51cc256fc74742e2e522ea7837
Author: CaolÃ¡n McNamara 
Date:   Sat Aug 29 20:26:27 2015 +0100

check stream status

Change-Id: I6b9537cf94ac1c5d996ba64ddf878745dadde254
(cherry picked from commit 452cd9e75de657e996e17510fe5d3539065489d1)
Reviewed-on: https://gerrit.libreoffice.org/18129
Reviewed-by: Norbert Thiebaud 
Tested-by: Norbert Thiebaud 

diff --git a/sd/qa/unit/data/ppt/pass/hang-21.ppt 
b/sd/qa/unit/data/ppt/pass/hang-21.ppt
new file mode 100644
index 000..99cf49f
Binary files /dev/null and b/sd/qa/unit/data/ppt/pass/hang-21.ppt differ
diff --git a/sd/source/filter/ppt/propread.cxx 
b/sd/source/filter/ppt/propread.cxx
index 1dbb832..08987b5 100644
--- a/sd/source/filter/ppt/propread.cxx
+++ b/sd/source/filter/ppt/propread.cxx
@@ -497,10 +497,18 @@ void Section::Read( SvStorageStream *pStrm )
 {
 sal_uInt32 nDictCount(0);
 pStrm->ReadUInt32(nDictCount);
+auto nMaxRecordsPossible = pStrm->remainingSize() / 
(sizeof(sal_uInt32)*2);
+if (nDictCount > nMaxRecordsPossible)
+{
+SAL_WARN("sd.filter", "Dictionary count of " << nDictCount << 
" claimed, only " << nMaxRecordsPossible << " possible");
+nDictCount = nMaxRecordsPossible;
+}
 for (sal_uInt32 i = 0; i < nDictCount; ++i)
 {
 sal_uInt32 nSize(0);
 pStrm->ReadUInt32( nSize ).ReadUInt32( nSize );
+if (!pStrm->good())
+break;
 sal_uInt64 nPos = pStrm->Tell() + nSize;
 if (nPos != pStrm->Seek(nPos))
 break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - filter/source sd/qa

2015-08-30 Thread Caolán McNamara

 filter/source/msfilter/svdfppt.cxx   |2 +-
 sd/qa/unit/data/ppt/pass/crash-3.ppt |binary
 2 files changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0ae8d68a0b7c6d2be21b5e903114b0fe3de5a49c
Author: CaolÃ¡n McNamara 
Date:   Sun Aug 30 20:14:16 2015 +0100

pClientData can be null

Change-Id: I9375f84affdaef30d9b1ded31525e6b7b8709cbc
(cherry picked from commit 7d4c77e374310bef538465d11980d1d610cbe0f1)
Reviewed-on: https://gerrit.libreoffice.org/18150
Reviewed-by: Norbert Thiebaud 
Tested-by: Norbert Thiebaud 

diff --git a/filter/source/msfilter/svdfppt.cxx 
b/filter/source/msfilter/svdfppt.cxx
index e1e14b8..73283e2 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -2576,7 +2576,7 @@ bool SdrPowerPointImport::GetColorFromPalette( sal_uInt16 
nNum, Color& rColor )
 bool SdrPowerPointImport::SeekToShape( SvStream& rSt, void* pClientData, 
sal_uInt32 nId ) const
 {
 bool bRet = SvxMSDffManager::SeekToShape( rSt, pClientData, nId );
-if ( !bRet )
+if (!bRet && pClientData)
 {
 ProcessData& rData = *( (ProcessData*)pClientData );
 PptSlidePersistEntry& rPersistEntry = rData.rPersistEntry;
diff --git a/sd/qa/unit/data/ppt/pass/crash-3.ppt 
b/sd/qa/unit/data/ppt/pass/crash-3.ppt
new file mode 100644
index 000..daa0102
Binary files /dev/null and b/sd/qa/unit/data/ppt/pass/crash-3.ppt differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: My work

2015-08-30 Thread Thorsten Behrens

Jack wrote:
> Due my slow internet connection, I am unable to upload my patches
> the regular way, so i am sending you my work in the
> attachment.
>
Hi Jack,

unfortunately no attachments made it through with your email.

> The file "fix.cxx" contains only the two functions, the file
> "PropertyMap.cxx" contains the whole patched file.
> 
> The docx-files are my test cases, they look different in LibreOffice
> than in Word. Failure_2 should be fixed with my patch.
> 
Please commit your changes locally, and extract them from git via 'git
format-patch -1'.

> These files may be used under any licence.
> 
To expedite matters, the much preferred way is to use stock wording
for licensing. Please see
https://wiki.documentfoundation.org/Development/Developers#Example_Statement
for examples & howto.

Thanks a lot,

-- Thorsten


signature.asc
Description: Digital signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: 2 commits - sfx2/source vcl/unx

2015-08-30 Thread Maxim Monastirsky

 sfx2/source/sidebar/SidebarController.cxx |   23 +++
 vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx |1 +
 2 files changed, 12 insertions(+), 12 deletions(-)

New commits:
commit e38c4105077b396b0b53e0296ae9cf142f51dd52
Author: Maxim Monastirsky 
Date:   Sun Aug 30 22:35:00 2015 +0300

tdf#83546 Expand the sidebar if it's hidden

Change-Id: I92620cb1439bd13efcdbafcdc584abd8d7bb4345

diff --git a/sfx2/source/sidebar/SidebarController.cxx 
b/sfx2/source/sidebar/SidebarController.cxx
index afb8449..a45f83e 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -481,20 +481,19 @@ void SidebarController::UpdateConfigurations()
 void SidebarController::OpenThenSwitchToDeck (
 const ::rtl::OUString& rsDeckId)
 {
-// fdo#67627 Clicking a second time on a Deck icon will close the Deck
-if (IsDeckVisible(rsDeckId))
+SfxSplitWindow* pSplitWindow = GetSplitWindow();
+if ( pSplitWindow && !pSplitWindow->IsFadeIn() )
+// tdf#83546 Collapsed sidebar should expand first
+pSplitWindow->FadeIn();
+else if ( IsDeckVisible( rsDeckId ) )
 {
-// fdo#88241 Summoning an undocked sidebar a second time should close 
sidebar
-if (!GetSplitWindow())
-{
-mpParentWindow->Close();
-return;
-}
-else
-{
+if ( pSplitWindow )
+// tdf#67627 Clicking a second time on a Deck icon will close the 
Deck
 RequestCloseDeck();
-return;
-}
+else
+// tdf#88241 Summoning an undocked sidebar a second time should 
close sidebar
+mpParentWindow->Close();
+return;
 }
 RequestOpenDeck();
 SwitchToDeck(rsDeckId);
commit 41c133250610243ed07bf294e4cee0ca9462be42
Author: Maxim Monastirsky 
Date:   Sun Aug 30 14:58:50 2015 +0300

GTK3: Native background for vertical toolbars

Change-Id: I19483c3aa4d37e0f4fe159139c85d0a31f002b5a

diff --git a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx 
b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
index 7344423..fab6301 100644
--- a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
@@ -949,6 +949,7 @@ bool GtkSalGraphics::drawNativeControl( ControlType nType, 
ControlPart nPart, co
 switch(nPart)
 {
 case PART_DRAW_BACKGROUND_HORZ:
+case PART_DRAW_BACKGROUND_VERT:
 context = mpToolbarStyle;
 break;
 case PART_BUTTON:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sal/qa

2015-08-30 Thread Damjan Jovanovic

 sal/qa/rtl/uuid/makefile.mk  |   26 +++
 sal/qa/rtl/uuid/rtl_Uuid.cxx |  140 ---
 2 files changed, 78 insertions(+), 88 deletions(-)

New commits:
commit 933db9c80d5510abdd3569a025f654102d83aaf5
Author: Damjan Jovanovic 
Date:   Sun Aug 30 19:10:42 2015 +

#i125003# migrate main/sal/qa/rtl/uuid from cppunit to Google Test.

diff --git a/sal/qa/rtl/uuid/makefile.mk b/sal/qa/rtl/uuid/makefile.mk
index 80f6b9a..df42f80 100644
--- a/sal/qa/rtl/uuid/makefile.mk
+++ b/sal/qa/rtl/uuid/makefile.mk
@@ -33,32 +33,30 @@ ENABLE_EXCEPTIONS=TRUE
 
 .INCLUDE :  settings.mk
 
+.IF "$(ENABLE_UNIT_TESTS)" != "YES"
+all:
+@echo unit tests are disabled. Nothing to do.
+ 
+.ELSE
+
 CFLAGS+= $(LFS_CFLAGS)
 CXXFLAGS+= $(LFS_CFLAGS)
 
-CFLAGSCXX += $(CPPUNIT_CFLAGS)
 
 # BEGIN 
 # auto generated Target:joblist by codegen.pl
-SHL1OBJS=  \
+APP1OBJS=  \
 $(SLO)$/rtl_Uuid.obj
 
-SHL1TARGET= rtl_Uuid
-SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
-
-SHL1IMPLIB= i$(SHL1TARGET)
-# SHL1DEF=$(MISC)$/$(SHL1TARGET).def
+APP1TARGET= rtl_Uuid
+APP1STDLIBS= $(SALLIB) $(GTESTLIB) $(TESTSHL2LIB)
+APP1RPATH = NONE
+APP1TEST = enabled
 
-DEF1NAME=$(SHL1TARGET)
-# DEF1EXPORTFILE= export.exp
-SHL1VERSIONMAP= $(PRJ)$/qa$/export.map
 # END --
-#--- All object files 
---
-# do this here, so we get right dependencies
-SLOFILES=$(SHL1OBJS)
 
 # --- Targets --
 
 .INCLUDE :  target.mk
-.INCLUDE : _cppunit.mk
 
+.ENDIF # "$(ENABLE_UNIT_TESTS)" != "YES" 
diff --git a/sal/qa/rtl/uuid/rtl_Uuid.cxx b/sal/qa/rtl/uuid/rtl_Uuid.cxx
index 1016af1..42a6eed 100644
--- a/sal/qa/rtl/uuid/rtl_Uuid.cxx
+++ b/sal/qa/rtl/uuid/rtl_Uuid.cxx
@@ -27,7 +27,6 @@
 #include 
 #include 
 
-#include 
 #include 
 #include 
 #include 
@@ -37,16 +36,18 @@
 #include 
 #endif
 
+#include "gtest/gtest.h"
+
 using namespace rtl;
 
 /** print a UNI_CODE String. And also print some comments of the string.
 */
 inline void printUString( const ::rtl::OUString & str, const sal_Char * msg = 
"" )
 {
-t_print("#%s #printUString_u# ", msg );
+printf("#%s #printUString_u# ", msg );
 rtl::OString aString;
 aString = ::rtl::OUStringToOString( str, RTL_TEXTENCODING_ASCII_US );
-t_print("%s\n", (char *)aString.getStr( ) );
+printf("%s\n", (char *)aString.getStr( ) );
 }
 
 /
@@ -71,21 +72,23 @@ void printUuid( sal_uInt8 *pNode )
 
 namespace rtl_Uuid
 {
-class createUuid : public CppUnit::TestFixture
+class createUuid : public ::testing::Test
 {
 public:
 // initialise your test code values here.
-void setUp()
+void SetUp()
 {
 }
 
-void tearDown()
+void TearDown()
 {
 }
 
+}; // class createUuid
+
 #define TEST_UUID 20
-void createUuid_001()
-{
+TEST_F(createUuid, createUuid_001)
+{
 sal_uInt8 aNode[TEST_UUID][16];
 sal_Int32 i,i2;
 for( i = 0 ; i < TEST_UUID ; i ++ )
@@ -106,11 +109,12 @@ public:
 if ( bRes == sal_False )
 break;
 }
-CPPUNIT_ASSERT_MESSAGE("createUuid: every uuid must be different.", bRes 
== sal_True );
-}
-   /*
-void createUuid_002()
-{
+ASSERT_TRUE(bRes == sal_True) << "createUuid: every uuid must be 
different.";
+}
+
+/*
+TEST_F(createUuid, createUuid_002)
+{
 sal_uInt8 pNode[16];
 sal_uInt8 aNode[TEST_UUID][16];
 sal_Int32 i,i2;
@@ -133,14 +137,8 @@ public:
 if ( bRes == sal_False )
 break;
 }
-CPPUNIT_ASSERT_MESSAGE("createUuid: every uuid must be different.", bRes 
== sal_True );
-}*/
-
-CPPUNIT_TEST_SUITE(createUuid);
-CPPUNIT_TEST(createUuid_001);
-//CPPUNIT_TEST(createUuid_002);
-CPPUNIT_TEST_SUITE_END();
-}; // class createUuid
+ASSERT_TRUE(bRes == sal_True) << "createUuid: every uuid must be 
different.";
+}*/
 
 namespace ThreadHelper
 {
@@ -155,70 +153,64 @@ namespace ThreadHelper
 }
 }
 
-class createNamedUuid : public CppUnit::TestFixture
+class createNamedUuid : public ::testing::Test
 {
 public:
 // initialise your test code values here.
-void setUp()
+void SetUp()
 {
 }
 
-void tearDown()
+void TearDown()
 {
 }
+}; // class createNamedUuid
 
-void createNamedUuid_001()
-{
-sal_uInt8 NameSpace_DNS[16] = RTL_UUID_NAMESPACE_DNS;
-sal_uInt8 NameSpace_URL[16] = RTL_UUID_NAMESPACE_URL;
-sal_uInt8 pPriorCalculatedUUID[16] = {
-0x52,0xc9,0x30,0xa5,
-0xd1,0x61,0x3b,0x16,
-0x98,0xc5,0xf8,0xd1,
-0x10,0x10,0x6d,0x4d };
-
-sal_uInt8 pNamedUUID[16], pNamedUUID2[16];
-
-// Same name does generate the same uuid
-rtl_String *pName = 0;
-rtl_string_newFromStr( &pName ,

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 54/c0e817a2db81d438e945bb4f0599e046df7459

2015-08-30 Thread Caolán McNamara

 54/c0e817a2db81d438e945bb4f0599e046df7459 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 4a19f1f5e1f96e265c3a094e9deeaa72c3d3f90c
Author: CaolÃ¡n McNamara 
Date:   Sun Aug 30 20:26:14 2015 +0100

Notes added by 'git notes add'

diff --git a/54/c0e817a2db81d438e945bb4f0599e046df7459 
b/54/c0e817a2db81d438e945bb4f0599e046df7459
new file mode 100644
index 000..0254e66
--- /dev/null
+++ b/54/c0e817a2db81d438e945bb4f0599e046df7459
@@ -0,0 +1 @@
+prefer: 63eef1c1cf203aa75093b479a1e8dd24593546e7
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 3d/bd4c284e3282c6dfa9798162fc6d84d5b19c46

2015-08-30 Thread Caolán McNamara

 3d/bd4c284e3282c6dfa9798162fc6d84d5b19c46 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit b8d1a353a4b7b1e90be207e820de01e366897c7e
Author: CaolÃ¡n McNamara 
Date:   Sun Aug 30 20:23:19 2015 +0100

Notes added by 'git notes add'

diff --git a/3d/bd4c284e3282c6dfa9798162fc6d84d5b19c46 
b/3d/bd4c284e3282c6dfa9798162fc6d84d5b19c46
new file mode 100644
index 000..8ebbe55
--- /dev/null
+++ b/3d/bd4c284e3282c6dfa9798162fc6d84d5b19c46
@@ -0,0 +1 @@
+ignore: obsolete
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 05/1fe77523469dca82d7cee1976c9b4fda860a04

2015-08-30 Thread Caolán McNamara

 05/1fe77523469dca82d7cee1976c9b4fda860a04 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 020af13ca2837139e3c1f04e6e412eb61156fc73
Author: CaolÃ¡n McNamara 
Date:   Sun Aug 30 20:23:36 2015 +0100

Notes added by 'git notes add'

diff --git a/05/1fe77523469dca82d7cee1976c9b4fda860a04 
b/05/1fe77523469dca82d7cee1976c9b4fda860a04
new file mode 100644
index 000..8e5c182
--- /dev/null
+++ b/05/1fe77523469dca82d7cee1976c9b4fda860a04
@@ -0,0 +1 @@
+ignore: aoo
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 62/e7650f158c2441dca7d7ba8e50523edc58600c

2015-08-30 Thread Caolán McNamara

 62/e7650f158c2441dca7d7ba8e50523edc58600c |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 7dbd96b8eb28459d1149c55c3bae947dedc04318
Author: CaolÃ¡n McNamara 
Date:   Sun Aug 30 20:22:35 2015 +0100

Notes added by 'git notes add'

diff --git a/62/e7650f158c2441dca7d7ba8e50523edc58600c 
b/62/e7650f158c2441dca7d7ba8e50523edc58600c
new file mode 100644
index 000..a5c0c77
--- /dev/null
+++ b/62/e7650f158c2441dca7d7ba8e50523edc58600c
@@ -0,0 +1 @@
+ignore: googletest
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 2 commits - 24/5c080c09b207c8e3c5b16c11049f3477069ae1 69/7eb3558a1224d4791adef36d6f0427edb475f5

2015-08-30 Thread Caolán McNamara

 24/5c080c09b207c8e3c5b16c11049f3477069ae1 |1 +
 69/7eb3558a1224d4791adef36d6f0427edb475f5 |1 +
 2 files changed, 2 insertions(+)

New commits:
commit 92a14b8d8b1767fc7cac95208f3a86bbca999e29
Author: CaolÃ¡n McNamara 
Date:   Sun Aug 30 20:22:27 2015 +0100

Notes added by 'git notes add'

diff --git a/69/7eb3558a1224d4791adef36d6f0427edb475f5 
b/69/7eb3558a1224d4791adef36d6f0427edb475f5
new file mode 100644
index 000..a5c0c77
--- /dev/null
+++ b/69/7eb3558a1224d4791adef36d6f0427edb475f5
@@ -0,0 +1 @@
+ignore: googletest
commit 931e4a28ed7505890fec8f1900078ca5b9e406bc
Author: CaolÃ¡n McNamara 
Date:   Sun Aug 30 20:22:19 2015 +0100

Notes added by 'git notes add'

diff --git a/24/5c080c09b207c8e3c5b16c11049f3477069ae1 
b/24/5c080c09b207c8e3c5b16c11049f3477069ae1
new file mode 100644
index 000..a5c0c77
--- /dev/null
+++ b/24/5c080c09b207c8e3c5b16c11049f3477069ae1
@@ -0,0 +1 @@
+ignore: googletest
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 2 commits - 3a/fc077389654c3400d4d7b6d20275f6635cda40 da/44b7365bd3b8fc8d6109c92cef73cd5ea34c60

2015-08-30 Thread Caolán McNamara

 3a/fc077389654c3400d4d7b6d20275f6635cda40 |1 +
 da/44b7365bd3b8fc8d6109c92cef73cd5ea34c60 |1 +
 2 files changed, 2 insertions(+)

New commits:
commit 03e7bea13b5569053b6ff9b4e79681f978c05257
Author: CaolÃ¡n McNamara 
Date:   Sun Aug 30 20:23:02 2015 +0100

Notes added by 'git notes add'

diff --git a/da/44b7365bd3b8fc8d6109c92cef73cd5ea34c60 
b/da/44b7365bd3b8fc8d6109c92cef73cd5ea34c60
new file mode 100644
index 000..a5c0c77
--- /dev/null
+++ b/da/44b7365bd3b8fc8d6109c92cef73cd5ea34c60
@@ -0,0 +1 @@
+ignore: googletest
commit 209d1b71f18af76a554a4e8f0c8a1344ab6e8ee4
Author: CaolÃ¡n McNamara 
Date:   Sun Aug 30 20:22:55 2015 +0100

Notes added by 'git notes add'

diff --git a/3a/fc077389654c3400d4d7b6d20275f6635cda40 
b/3a/fc077389654c3400d4d7b6d20275f6635cda40
new file mode 100644
index 000..a5c0c77
--- /dev/null
+++ b/3a/fc077389654c3400d4d7b6d20275f6635cda40
@@ -0,0 +1 @@
+ignore: googletest
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 2 commits - 16/08655b290700db0dd8a6fc1b0951411c59463b c7/7bd087b86f22ca5620eaf068537fca712317be

2015-08-30 Thread Caolán McNamara

 16/08655b290700db0dd8a6fc1b0951411c59463b |1 +
 c7/7bd087b86f22ca5620eaf068537fca712317be |1 +
 2 files changed, 2 insertions(+)

New commits:
commit 0ad1dac3048a930198a6b8537f167dabaa015089
Author: CaolÃ¡n McNamara 
Date:   Sun Aug 30 20:21:45 2015 +0100

Notes added by 'git notes add'

diff --git a/c7/7bd087b86f22ca5620eaf068537fca712317be 
b/c7/7bd087b86f22ca5620eaf068537fca712317be
new file mode 100644
index 000..a5c0c77
--- /dev/null
+++ b/c7/7bd087b86f22ca5620eaf068537fca712317be
@@ -0,0 +1 @@
+ignore: googletest
commit 2c3f28d7e8d8642825cdc486d54aff0c6fac8fd9
Author: CaolÃ¡n McNamara 
Date:   Sun Aug 30 20:21:31 2015 +0100

Notes added by 'git notes add'

diff --git a/16/08655b290700db0dd8a6fc1b0951411c59463b 
b/16/08655b290700db0dd8a6fc1b0951411c59463b
new file mode 100644
index 000..a5c0c77
--- /dev/null
+++ b/16/08655b290700db0dd8a6fc1b0951411c59463b
@@ -0,0 +1 @@
+ignore: googletest
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 2 commits - 07/82738ecaed1a6915895ccf20af9e9fbb785563 db/55c60c645e6c11f28d47f84cc3ab725a247037

2015-08-30 Thread Caolán McNamara

 07/82738ecaed1a6915895ccf20af9e9fbb785563 |1 +
 db/55c60c645e6c11f28d47f84cc3ab725a247037 |1 +
 2 files changed, 2 insertions(+)

New commits:
commit e8bbfd1a5e0aa370e5bef5522060b73790acd4d8
Author: CaolÃ¡n McNamara 
Date:   Sun Aug 30 20:22:03 2015 +0100

Notes added by 'git notes add'

diff --git a/db/55c60c645e6c11f28d47f84cc3ab725a247037 
b/db/55c60c645e6c11f28d47f84cc3ab725a247037
new file mode 100644
index 000..a5c0c77
--- /dev/null
+++ b/db/55c60c645e6c11f28d47f84cc3ab725a247037
@@ -0,0 +1 @@
+ignore: googletest
commit dcc1d24fe4bbd2ed9ec946d118691952bf8478df
Author: CaolÃ¡n McNamara 
Date:   Sun Aug 30 20:21:53 2015 +0100

Notes added by 'git notes add'

diff --git a/07/82738ecaed1a6915895ccf20af9e9fbb785563 
b/07/82738ecaed1a6915895ccf20af9e9fbb785563
new file mode 100644
index 000..a5c0c77
--- /dev/null
+++ b/07/82738ecaed1a6915895ccf20af9e9fbb785563
@@ -0,0 +1 @@
+ignore: googletest
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 2 commits - 61/224f2be25942cee9f2222506f5311c619539c8 80/0ee3d0e0d43d4ea3ec10f9ea73fe8d68a40c18

2015-08-30 Thread Caolán McNamara

 61/224f2be25942cee9f506f5311c619539c8 |1 +
 80/0ee3d0e0d43d4ea3ec10f9ea73fe8d68a40c18 |1 +
 2 files changed, 2 insertions(+)

New commits:
commit bd3a35a1e858c6c51302a7d71b11b08937e5458a
Author: CaolÃ¡n McNamara 
Date:   Sun Aug 30 20:21:22 2015 +0100

Notes added by 'git notes add'

diff --git a/80/0ee3d0e0d43d4ea3ec10f9ea73fe8d68a40c18 
b/80/0ee3d0e0d43d4ea3ec10f9ea73fe8d68a40c18
new file mode 100644
index 000..a5c0c77
--- /dev/null
+++ b/80/0ee3d0e0d43d4ea3ec10f9ea73fe8d68a40c18
@@ -0,0 +1 @@
+ignore: googletest
commit 1c1f3f6fb4d64116732c85a6224583bacac57796
Author: CaolÃ¡n McNamara 
Date:   Sun Aug 30 20:21:13 2015 +0100

Notes added by 'git notes add'

diff --git a/61/224f2be25942cee9f506f5311c619539c8 
b/61/224f2be25942cee9f506f5311c619539c8
new file mode 100644
index 000..a5c0c77
--- /dev/null
+++ b/61/224f2be25942cee9f506f5311c619539c8
@@ -0,0 +1 @@
+ignore: googletest
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: filter/source sd/qa

2015-08-30 Thread Caolán McNamara

 filter/source/msfilter/svdfppt.cxx   |2 +-
 sd/qa/unit/data/ppt/pass/crash-3.ppt |binary
 2 files changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7d4c77e374310bef538465d11980d1d610cbe0f1
Author: CaolÃ¡n McNamara 
Date:   Sun Aug 30 20:14:16 2015 +0100

pClientData can be null

Change-Id: I9375f84affdaef30d9b1ded31525e6b7b8709cbc

diff --git a/filter/source/msfilter/svdfppt.cxx 
b/filter/source/msfilter/svdfppt.cxx
index ad20a86..744b5e9 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -2588,7 +2588,7 @@ bool SdrPowerPointImport::GetColorFromPalette( sal_uInt16 
nNum, Color& rColor )
 bool SdrPowerPointImport::SeekToShape( SvStream& rSt, void* pClientData, 
sal_uInt32 nId ) const
 {
 bool bRet = SvxMSDffManager::SeekToShape( rSt, pClientData, nId );
-if ( !bRet )
+if (!bRet && pClientData)
 {
 ProcessData& rData = *static_cast(pClientData);
 PptSlidePersistEntry& rPersistEntry = rData.rPersistEntry;
diff --git a/sd/qa/unit/data/ppt/pass/crash-3.ppt 
b/sd/qa/unit/data/ppt/pass/crash-3.ppt
new file mode 100644
index 000..daa0102
Binary files /dev/null and b/sd/qa/unit/data/ppt/pass/crash-3.ppt differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: svtools/source

2015-08-30 Thread Julien Nabet

 svtools/source/control/ctrlbox.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 33d8a094e1f8483abe2bfcfa118997beab034be5
Author: Julien Nabet 
Date:   Sat Aug 29 00:12:53 2015 +0200

tdf#93733: Assertion failed when clear font size field in paragraph style

Change-Id: Ia7748eae16c35a1d197b9f4aa5f391f496e7f2f2
Reviewed-on: https://gerrit.libreoffice.org/18122
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/svtools/source/control/ctrlbox.cxx 
b/svtools/source/control/ctrlbox.cxx
index c315ff7..fe3a390 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -1595,7 +1595,7 @@ void FontSizeBox::Modify()
 pStr++;
 }
 }
-else
+else if (!aStr.isEmpty())
 {
 if ( -1 != aStr.indexOf('%') )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 6 commits - extensions.lst salhelper/prj salhelper/qa sal/prj sal/qa

2015-08-30 Thread Damjan Jovanovic

 extensions.lst |2 
 sal/prj/build.lst  |1 
 sal/qa/ByteSequence/ByteSequence.cxx   |  253 +++--
 sal/qa/ByteSequence/main.cxx   |   28 +++
 sal/qa/ByteSequence/makefile.mk|   25 +--
 sal/qa/osl/condition/osl_Condition.cxx |3 
 sal/qa/osl/thread/makefile.mk  |   26 +--
 sal/qa/osl/thread/test_thread.cxx  |   55 +++
 sal/qa/osl/thread/version.map  |   30 ---
 salhelper/prj/build.lst|1 
 salhelper/qa/main.cxx  |   28 +++
 salhelper/qa/makefile.mk   |   26 +--
 salhelper/qa/test_api.cxx  |  122 +--
 salhelper/qa/version.map   |   26 ---
 14 files changed, 286 insertions(+), 340 deletions(-)

New commits:
commit c77bd087b86f22ca5620eaf068537fca712317be
Author: Damjan Jovanovic 
Date:   Sun Aug 30 18:00:24 2015 +

Put the main function in the test file instead of a separate missing file.

diff --git a/sal/qa/osl/thread/makefile.mk b/sal/qa/osl/thread/makefile.mk
index 7998e01..252d31d 100644
--- a/sal/qa/osl/thread/makefile.mk
+++ b/sal/qa/osl/thread/makefile.mk
@@ -36,7 +36,7 @@ all:
 .ELSE
 
 APP1TARGET = $(TARGET)
-APP1OBJS = $(SLO)$/test_thread.obj $(SLO)$/main.obj
+APP1OBJS = $(SLO)$/test_thread.obj
 APP1STDLIBS= $(SALLIB) $(GTESTLIB) $(TESTSHL2LIB)
 APP1RPATH = NONE
 APP1TEST = enabled
diff --git a/sal/qa/osl/thread/test_thread.cxx 
b/sal/qa/osl/thread/test_thread.cxx
index 38896b5..afa5ead 100644
--- a/sal/qa/osl/thread/test_thread.cxx
+++ b/sal/qa/osl/thread/test_thread.cxx
@@ -78,3 +78,9 @@ TEST_F(Test, test) {
 
 }
 
+int main(int argc, char **argv)
+{
+::testing::InitGoogleTest(&argc, argv);
+return RUN_ALL_TESTS();
+}
+
commit 0782738ecaed1a6915895ccf20af9e9fbb785563
Author: Damjan Jovanovic 
Date:   Sun Aug 30 17:35:41 2015 +

#i125003# migrate main/sal/qa/osl/thread from cppunit to Google Test

and run it on every build.

diff --git a/sal/prj/build.lst b/sal/prj/build.lst
index 4b568a8..d8d03b8 100644
--- a/sal/prj/build.lst
+++ b/sal/prj/build.lst
@@ -24,4 +24,5 @@ sa sal\qa\OStringBuffer nmake - all sa_qa_OStringBuffer 
sa_cppunittester sa_util
 sa sal\qa\osl\mutex nmake - all sa_qa_osl_mutex sa_cppunittester sa_util NULL
 sa sal\qa\osl\profile nmake - all sa_qa_osl_profile sa_cppunittester sa_util 
NULL
 sa sal\qa\osl\setthreadname nmake - all sa_qa_osl_setthreadname 
sa_cppunittester sa_util NULL
+sa sal\qa\osl\thread nmake - all sa_qa_osl_thread sa_cppunittester sa_util NULL
 sa sal\qa\rtl\math nmake - all sa_qa_rtl_math sa_cppunittester sa_util NULL
diff --git a/sal/qa/osl/thread/makefile.mk b/sal/qa/osl/thread/makefile.mk
index 115fc8e..7998e01 100644
--- a/sal/qa/osl/thread/makefile.mk
+++ b/sal/qa/osl/thread/makefile.mk
@@ -29,20 +29,18 @@ ENABLE_EXCEPTIONS := TRUE
 
 .INCLUDE: settings.mk
 
-DLLPRE = # no leading "lib" on .so files
-
-SHL1TARGET = $(TARGET)
-SHL1OBJS = $(SLO)$/test_thread.obj
-SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
-SHL1VERSIONMAP = version.map
-SHL1IMPLIB = i$(SHL1TARGET)
-DEF1NAME = $(SHL1TARGET)
-
-SLOFILES = $(SHL1OBJS)
+.IF "$(ENABLE_UNIT_TESTS)" != "YES"
+all:
+@echo unit tests are disabled. Nothing to do.
+ 
+.ELSE
+
+APP1TARGET = $(TARGET)
+APP1OBJS = $(SLO)$/test_thread.obj $(SLO)$/main.obj
+APP1STDLIBS= $(SALLIB) $(GTESTLIB) $(TESTSHL2LIB)
+APP1RPATH = NONE
+APP1TEST = enabled
 
 .INCLUDE: target.mk
 
-ALLTAR: test
-
-test .PHONY: $(SHL1TARGETN)
-testshl2 $(SHL1TARGETN)
+.ENDIF # "$(ENABLE_UNIT_TESTS)" != "YES"
diff --git a/sal/qa/osl/thread/test_thread.cxx 
b/sal/qa/osl/thread/test_thread.cxx
index f09636f..38896b5 100644
--- a/sal/qa/osl/thread/test_thread.cxx
+++ b/sal/qa/osl/thread/test_thread.cxx
@@ -26,11 +26,11 @@
 
 #include "sal/config.h"
 
-#include "testshl/simpleheader.hxx"
 #include "osl/conditn.hxx"
 #include "osl/thread.hxx"
 #include "osl/time.h"
 #include "sal/types.h"
+#include "gtest/gtest.h"
 
 namespace {
 
@@ -45,41 +45,36 @@ private:
 
 virtual void SAL_CALL onTerminated() {
 m_cond.set();
-CPPUNIT_ASSERT_EQUAL(osl::Condition::result_ok, global.wait());
+ASSERT_EQ(osl::Condition::result_ok, global.wait());
 }
 
 osl::Condition & m_cond;
 };
 
-class Test: public CppUnit::TestFixture {
+class Test: public ::testing::Test {
 public:
-// Nondeterministic, best effort test that an osl::Thread can be destroyed
-// (and in particular osl_destroyThread---indirectly---be called) before 
the
-// corresponding thread has terminated:
-void test() {
-for (int i = 0; i < 50; ++i) {
-osl::Condition c;
-Thread t(c);
-CPPUNIT_ASSERT(t.create());
-// Make sure virtual Thread::run/onTerminated are called before
-// Thread::~Thread:
-CPPUNIT_ASSERT_EQUAL(osl::Condition::result_ok, c.wait());
-}
-// Make sure Thread::~Thread is called before each spawned th

[Libreoffice-commits] core.git: include/svtools

2015-08-30 Thread Stephan Bergmann

 include/svtools/autocmpledit.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 70bcfb7041ce370988f6184fbe2cdbc402e07843
Author: Stephan Bergmann 
Date:   Sun Aug 30 19:45:28 2015 +0200

loplugin:saloverride

Change-Id: Ibb6f8ee56a1849622493def5bf469dfd1469ba73

diff --git a/include/svtools/autocmpledit.hxx b/include/svtools/autocmpledit.hxx
index 49407d44..6bef6fa 100644
--- a/include/svtools/autocmpledit.hxx
+++ b/include/svtools/autocmpledit.hxx
@@ -25,7 +25,7 @@ private:
 
 void AutoCompleteHandler( Edit* );
 bool Match( const OUString& rText );
-bool PreNotify( NotifyEvent& rNEvt );
+bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
 
 public:
 AutocompleteEdit( vcl::Window* pParent );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/o3tl

2015-08-30 Thread Stephan Bergmann

 include/o3tl/cow_wrapper.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 78e95e46bbc60fd14160eb22a7a876aa32ca9b87
Author: Stephan Bergmann 
Date:   Sun Aug 30 19:37:34 2015 +0200

loplugin:simplifybool

Change-Id: I5bfc2a84cef68421757e9aa8f5e4bcb1d6caf7bf

diff --git a/include/o3tl/cow_wrapper.hxx b/include/o3tl/cow_wrapper.hxx
index a5edebf..f3db60e 100644
--- a/include/o3tl/cow_wrapper.hxx
+++ b/include/o3tl/cow_wrapper.hxx
@@ -286,7 +286,7 @@ int cow_wrapper_client::queryUnmodified() const
 /// true, if not shared with any other cow_wrapper instance
 bool is_unique() const // nothrow
 {
-return m_pimpl ? m_pimpl->m_ref_count == 1 : true;
+return !m_pimpl || m_pimpl->m_ref_count == 1;
 }
 
 /// return number of shared instances (1 for unique object)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: unit test fails in writerperfect

2015-08-30 Thread Regina Henschel


Hi Ashod,

I see no way to copy the Call Stack. I have attached a screen shot instead.


Ashod Nakashian schrieb:


On Sun, Aug 30, 2015 at 12:18 PM, Regina Henschel
mailto:rb.hensc...@t-online.de>> wrote:

Hi Ashod,

I was more bravely now and have clicked on "start" in Visual Studio.
Then a command window opened and therein I get
http://pastebin.ca/3138849
Then it stops with the error message:
Unhangled exception at 0x0229B9A1 (vcllo.dll) in cppunittester.exe:
0xC005: Access violation writing location 0x0004.

I have pressed "Bread".

And now?

Great. You can now look at the stack where the exception happens.

Go to the Debug menu > Windows > Call Stack.

You can also use the many other tools to debug and find the root of the
problem.

But the stack is where you want to start. Try to find the first function
(from the top) that is within LO project.
Most likely the debugger stopped in a helper function that we don't care
about.

Double click on that function, and it should open the source code.


It has opened a source code automatically. At that point I see in the 
auto watch window for "this" a value of "0x ".



If it opens the disassembly window, just close it and double-click on
the function again (assuming you have the sources in the right place and
the function IS in our code, it should work).

Try to figure out the context by navigating (double click on function
name in stack) and see what variable has the unexpected value.



I think, that I'm unable to cope with "what variable has the unexpected 
value". That is something for those who are familiar with that part of code.


I see that David Tardon has pushed patches. Perhaps they are related to 
the problem?


Nevertheless, thank you for guiding me further in the use of Visual Studio.

Kind regards
Regina


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

[Libreoffice-commits] core.git: 6 commits - external/libabw external/libcdr external/libmwaw external/libodfgen external/libvisio external/libwps

2015-08-30 Thread David Tardon

 external/libabw/ExternalProject_libabw.mk   |3 ++-
 external/libcdr/ExternalProject_libcdr.mk   |3 ++-
 external/libmwaw/ExternalProject_libmwaw.mk |6 ++
 external/libmwaw/Library_mwaw.mk|3 +--
 external/libodfgen/ExternalProject_libodfgen.mk |4 ++--
 external/libodfgen/Library_odfgen.mk|3 +--
 external/libvisio/ExternalProject_libvisio.mk   |3 ++-
 external/libwps/0001-add-missing-include.patch  |   24 
 external/libwps/ExternalProject_libwps.mk   |4 ++--
 external/libwps/Library_wps.mk  |3 +--
 external/libwps/UnpackedTarball_libwps.mk   |1 +
 11 files changed, 40 insertions(+), 17 deletions(-)

New commits:
commit d4cac4de650ee9339b7e513c8762bfce6574af76
Author: David Tardon 
Date:   Sun Aug 30 17:59:53 2015 +0200

libcdr: fix build with boost 1.59

Change-Id: Ie12338eae161f0a13fa4ff036e41d389bc0d616a

diff --git a/external/libcdr/ExternalProject_libcdr.mk 
b/external/libcdr/ExternalProject_libcdr.mk
index e4d7c9b..96930fe 100644
--- a/external/libcdr/ExternalProject_libcdr.mk
+++ b/external/libcdr/ExternalProject_libcdr.mk
@@ -36,7 +36,8 @@ $(call gb_ExternalProject_get_state_target,libcdr,build) :
--disable-werror \
--disable-weffc \
$(if 
$(verbose),--disable-silent-rules,--enable-silent-rules) \
-   CXXFLAGS="$(if 
$(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost))" \
+   CXXFLAGS="$(if 
$(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost)) \
+   -DBOOST_ERROR_CODE_HEADER_ONLY 
-DBOOST_SYSTEM_NO_DEPRECATED" \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM)) \
&& $(MAKE) \
)
commit 70b8f2e254860027ce575f3bd27ce92c04761a08
Author: David Tardon 
Date:   Sun Aug 30 17:57:47 2015 +0200

libvisio: fix build with boost 1.59

Change-Id: Ib90425d6908bc0bfe2efb633d0215f77546e4c38

diff --git a/external/libvisio/ExternalProject_libvisio.mk 
b/external/libvisio/ExternalProject_libvisio.mk
index b714788..6ecfa43 100644
--- a/external/libvisio/ExternalProject_libvisio.mk
+++ b/external/libvisio/ExternalProject_libvisio.mk
@@ -35,7 +35,8 @@ $(call gb_ExternalProject_get_state_target,libvisio,build) :
$(if $(ENABLE_DEBUG),--enable-debug,--disable-debug) \
--disable-werror \
$(if 
$(verbose),--disable-silent-rules,--enable-silent-rules) \
-   CXXFLAGS="$(if 
$(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost))" \
+   CXXFLAGS="$(if 
$(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost)) \
+   -DBOOST_ERROR_CODE_HEADER_ONLY 
-DBOOST_SYSTEM_NO_DEPRECATED" \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM)) \
&& $(MAKE) \
)
commit 51c292b85204f1c4d9ef78fd49bfb50f3afe
Author: David Tardon 
Date:   Sun Aug 30 17:39:09 2015 +0200

libabw: fix build with boost 1.59

Change-Id: I2213101623ba7e2cc329b659e17abe3d82e6b634

diff --git a/external/libabw/ExternalProject_libabw.mk 
b/external/libabw/ExternalProject_libabw.mk
index 9a07409..980aada 100644
--- a/external/libabw/ExternalProject_libabw.mk
+++ b/external/libabw/ExternalProject_libabw.mk
@@ -35,7 +35,8 @@ $(call gb_ExternalProject_get_state_target,libabw,build) :
--disable-werror \
$(if 
$(verbose),--disable-silent-rules,--enable-silent-rules) \
CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),\
-   -I$(call gb_UnpackedTarball_get_dir,boost))" \
+   -I$(call gb_UnpackedTarball_get_dir,boost)) \
+   -DBOOST_ERROR_CODE_HEADER_ONLY 
-DBOOST_SYSTEM_NO_DEPRECATED" \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM)) \
&& $(MAKE) \
)
commit 6ac4772ecc038c3e041a8b9bb594c53d977ac0f2
Author: David Tardon 
Date:   Sun Aug 30 13:24:55 2015 +0200

libodfgen: drop dep. on boost

Change-Id: If13cdf90de752626bbd37877fea045faae0616cb

diff --git a/external/libodfgen/ExternalProject_libodfgen.mk 
b/external/libodfgen/ExternalProject_libodfgen.mk
index b60d406..4f5ca4e 100644
--- a/external/libodfgen/ExternalProject_libodfgen.mk
+++ b/external/libodfgen/ExternalProject_libodfgen.mk
@@ -16,7 +16,6 @@ $(eval $(call gb_ExternalProject_register_targets,libodfgen,\
 ))
 
 $(eval $(call gb_ExternalProject_use_externals,libodfgen,\
-   boost_headers \
revenge \
 ))
 
@@ -34,8 +33,9 @@ $(call gb_ExternalProject_get_state_target,libodfgen,build) :

Re: unit test fails in writerperfect

2015-08-30 Thread Ashod Nakashian

On Sun, Aug 30, 2015 at 12:18 PM, Regina Henschel 
wrote:

> Hi Ashod,
>
> I was more bravely now and have clicked on "start" in Visual Studio. Then
> a command window opened and therein I get http://pastebin.ca/3138849
> Then it stops with the error message:
> Unhangled exception at 0x0229B9A1 (vcllo.dll) in cppunittester.exe:
> 0xC005: Access violation writing location 0x0004.
>
> I have pressed "Bread".
>
> And now?
>
> Great. You can now look at the stack where the exception happens.

Go to the Debug menu > Windows > Call Stack.

You can also use the many other tools to debug and find the root of the
problem.

But the stack is where you want to start. Try to find the first function
(from the top) that is within LO project.
Most likely the debugger stopped in a helper function that we don't care
about.

Double click on that function, and it should open the source code.
If it opens the disassembly window, just close it and double-click on the
function again (assuming you have the sources in the right place and the
function IS in our code, it should work).

Try to figure out the context by navigating (double click on function name
in stack) and see what variable has the unexpected value.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: unit test fails in writerperfect

2015-08-30 Thread Regina Henschel


Hi Ashod,

Ashod Nakashian schrieb:


On Sun, Aug 30, 2015 at 8:39 AM, Regina Henschel
mailto:rb.hensc...@t-online.de>> wrote:

Hi David,

David Tardon schrieb:

So it is a segfault, not a unit test failure... Could you get a
stack trace?


I think no. I have never done it. I would need a step-by-step
description for dummies.


Regina, you can debug in visual studio using the following command:

CPPUNITTRACE="\"C:/Program Files (x86)/Microsoft Visual Studio
12.0/Common7/IDE/devenv.exe\" /debugexe" /opt/lo/bin/make 

You need to correct the path to devenv and find the test_name that is
failing. You should find it near the end of the output. They all start
with 'CppunitTest_'.

When you run the above command, it will run the failing unittest from
within visual studio, which will break when it crashes. This will give
you an opportunity to inspect the stack trace (from the stack debug
window) and also see the code and line where it faults (if inside LO
codebase).

Let me know if you need more help.


I was more bravely now and have clicked on "start" in Visual Studio. 
Then a command window opened and therein I get http://pastebin.ca/3138849

Then it stops with the error message:
Unhangled exception at 0x0229B9A1 (vcllo.dll) in cppunittester.exe:
0xC005: Access violation writing location 0x0004.

I have pressed "Bread".

And now?

Kind regards
Regina


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

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - cui/source

2015-08-30 Thread Andrea Pescetti

 cui/source/dialogs/SpellDialog.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 54c0e817a2db81d438e945bb4f0599e046df7459
Author: Andrea Pescetti 
Date:   Sun Aug 30 15:36:27 2015 +

#i126447# Fix text deletion when toggling "Check grammar" in spell checker.

Patch by: Stefan Heinemann 

diff --git a/cui/source/dialogs/SpellDialog.cxx 
b/cui/source/dialogs/SpellDialog.cxx
index 6c95a20..5366370 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -787,7 +787,7 @@ void SpellDialog::Impl_Restore()
 //get a new sentence
 aSentenceED.SetText(rtl::OUString());
 aSentenceED.ResetModified();
-SpellContinue_Impl();
+SpellContinue_Impl(true);
 aIgnorePB.SetText(aIgnoreOnceST);
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: unit test fails in writerperfect

2015-08-30 Thread Regina Henschel


Hi Ashod,

Ashod Nakashian schrieb:


On Sun, Aug 30, 2015 at 8:39 AM, Regina Henschel
mailto:rb.hensc...@t-online.de>> wrote:

Hi David,

David Tardon schrieb:

So it is a segfault, not a unit test failure... Could you get a
stack trace?


I think no. I have never done it. I would need a step-by-step
description for dummies.


Regina, you can debug in visual studio using the following command:

CPPUNITTRACE="\"C:/Program Files (x86)/Microsoft Visual Studio
12.0/Common7/IDE/devenv.exe\" /debugexe" /opt/lo/bin/make 

You need to correct the path to devenv and find the test_name that is
failing. You should find it near the end of the output. They all start
with 'CppunitTest_'.

When you run the above command, it will run the failing unittest from
within visual studio, which will break when it crashes. This will give
you an opportunity to inspect the stack trace (from the stack debug
window) and also see the code and line where it faults (if inside LO
codebase).

Let me know if you need more help.


I have run the command
$ CPPUNITTRACE="\"C:/Program Files/Microsoft Visual Studio 
12.0/Common7/IDE/devenv.exe\" /debugexe" /opt/lo/bin/make 
CppunitTest_writerperfect_writer


But I get nothing. Visual Studio starts with "cppunittester" in 
title-bar. In the Cygwin window I get last line

[build CUT] writerperfect_writer

Then nothing more happens, no process activity, no hard disk actions. 
Cygwin does not come back to prompt.


Kind regards
Regina

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

[Libreoffice-commits] core.git: bin/find-german-comments

2015-08-30 Thread Lucas Satabin

 bin/find-german-comments |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f09218141cfad230202f370b0366042ca74a52ca
Author: Lucas Satabin 
Date:   Thu Aug 27 20:24:40 2015 +0200

Mark rsc comments as translated

Change-Id: I6f6248678462f64e469ce9f7b7889e73624e34af
Reviewed-on: https://gerrit.libreoffice.org/18067
Tested-by: Jenkins 
Reviewed-by: Norbert Thiebaud 

diff --git a/bin/find-german-comments b/bin/find-german-comments
index c8493be..1fb755c 100755
--- a/bin/find-german-comments
+++ b/bin/find-german-comments
@@ -296,7 +296,7 @@ class Parser:
 "registry" : 1,
 "remotebridges" : 1,
 "reportdesign" : 0, #
-"rsc" : 0, #
+"rsc" : 1,
 "sal" : 1,
 "salhelper" : 1,
 "sax" : 1,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 39468] translate German comments, removing redundant ones

2015-08-30 Thread bugzilla-daemon

https://bugs.documentfoundation.org/show_bug.cgi?id=39468

--- Comment #200 from Commit Notification 
 ---
Lucas Satabin committed a patch related to this issue.
It has been pushed to "master":

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

tdf#39468: Translate German comments in core/rsc/inc

It will be available in 5.1.0.

The patch should be included in the daily builds available at
http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More
information about daily builds can be found at:
http://wiki.documentfoundation.org/Testing_Daily_Builds
Affected users are encouraged to test the fix and report feedback.

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: rsc/inc

2015-08-30 Thread Lucas Satabin

 rsc/inc/rscarray.hxx |   13 +++-
 rsc/inc/rscclass.hxx |   26 
 rsc/inc/rscconst.hxx |   16 -
 rsc/inc/rsccont.hxx  |   13 +++-
 rsc/inc/rscdb.hxx|   37 +++
 rsc/inc/rscdef.hxx   |   38 +++
 rsc/inc/rscflag.hxx  |   12 +++
 rsc/inc/rsckey.hxx   |6 +--
 rsc/inc/rscrange.hxx |   42 +-
 rsc/inc/rscrsc.hxx   |   18 +--
 rsc/inc/rscstr.hxx   |   10 +++---
 rsc/inc/rsctop.hxx   |   82 ---
 rsc/inc/rsctree.hxx  |   10 ++
 13 files changed, 157 insertions(+), 166 deletions(-)

New commits:
commit 686c85f768cf4f9566375e9cf54aab950eadf4cc
Author: Lucas Satabin 
Date:   Tue Aug 25 18:57:23 2015 +0200

tdf#39468: Translate German comments in core/rsc/inc

Change-Id: I5d878192bde816e59ef570731113b526e8098d85
Reviewed-on: https://gerrit.libreoffice.org/18065
Tested-by: Jenkins 
Reviewed-by: Norbert Thiebaud 

diff --git a/rsc/inc/rscarray.hxx b/rsc/inc/rscarray.hxx
index 232091f..65a74e9 100644
--- a/rsc/inc/rscarray.hxx
+++ b/rsc/inc/rscarray.hxx
@@ -49,16 +49,13 @@ struct RscArrayInst
 RscInstNode *   pNode;
 };
 
-/* Der Baum wird ueber die Werte des Enums sortiert, nicht ueber
-seine HashId.
-*/
+/* The tree is sorted against its enum value, not gainst its HashId */
 class RscArray : public RscTop
 {
 protected:
-RscEnum *   pTypeClass; // Typ der Eintraege
-sal_uInt32  nSize;  // Groesse der Instanzdaten dieser Klasse
-// mit Superklassen
-sal_uInt32  nOffInstData;// Offset auf eigen Instanzdaten
+RscEnum *   pTypeClass; // type of entries
+sal_uInt32  nSize;  // size of this class instance data with super 
class
+sal_uInt32  nOffInstData;// Offset of self instance data
 voidWriteSrcArray( const RSCINST & rInst, FILE * fOutput,
RscTypCont * pTC, sal_uInt32 nTab, const 
char * );
 public:
@@ -77,7 +74,7 @@ public:
  RscTop * pCreateClass,
  RSCINST * pGetInst ) SAL_OVERRIDE;
 
-// Gibt die Groesse der Klasse in Bytes
+// gives the size of the class in bytes
 sal_uInt32  Size() SAL_OVERRIDE { return nSize; }
 
 boolIsConsistent( const RSCINST & rInst ) SAL_OVERRIDE;
diff --git a/rsc/inc/rscclass.hxx b/rsc/inc/rscclass.hxx
index 7d2b09e..668098a 100644
--- a/rsc/inc/rscclass.hxx
+++ b/rsc/inc/rscclass.hxx
@@ -33,19 +33,19 @@ protected:
 };
 struct VARTYPE_STRUCT
 {
-AtomnVarName;   // Variablenname
-RSCVAR  nVarType;   // Variablentyp
-sal_uInt32  nMask;  // Maskierungsbit
-sal_uInt32  nOffset;// Beginn der Instanzdaten
-RscTop *pClass; // Klasse
-CLASS_DATA  pDefault;   // Zeiger auf DefaultDaten
-AtomnDataBaseName;//Name fuer Fremddatenbereich
+AtomnVarName;   // variable name
+RSCVAR  nVarType;   // variable type
+sal_uInt32  nMask;  // bit mask
+sal_uInt32  nOffset;// start of instance data
+RscTop *pClass; // class
+CLASS_DATA  pDefault;   // pointer to default data
+AtomnDataBaseName;//name of foreign data area
 };
-sal_uInt32  nSuperSize; // Groesse der Instanzdaten der SuperKl.
-sal_uInt32  nSize;  // Groesse der Instanzdaten dieser Klasse
-// mit Superklassen
-sal_uInt32  nEntries;   // Eintraege in pVarTypeList
-VARTYPE_STRUCT *pVarTypeList;   // Variablenliste
+sal_uInt32  nSuperSize; // size of super class instance data
+sal_uInt32  nSize;  // size of this class instance data
+// with super class
+sal_uInt32  nEntries;   // entries in pVarTypeList
+VARTYPE_STRUCT *pVarTypeList;   // variable list
 RSCINST GetInstData( CLASS_DATA pData, sal_uInt32 nEle,
  bool bGetCopy = false );
 CLASS_DATA  GetDfltData( sal_uInt32 nEle );
@@ -73,7 +73,7 @@ public:
  RscTop * pCreateClass = NULL ) SAL_OVERRIDE;
 RSCINST GetCopyVar( const RSCINST & rInst, Atom nVarName ) 
SAL_OVERRIDE;
 
-// Gibt die Groesse der Klasse in Bytes
+// gives the class size in bytes
 sal_uInt32  Size() SAL_OVERRIDE { return nSize; }
 
 boolIsConsistent( const RSCINST & rInst ) SAL_OVERRIDE;
diff --git a/rsc/inc/rscconst.hxx b/rsc/inc/rscconst.hxx
index 55ea458..201d3f2 100644
--- a/rsc/inc/rscconst.hxx
+++ b/rsc/inc/rscconst.hxx
@@ -29,16 +29,16 @@ class RscConst : public RscTop
 protected:
 struc

[Bug 39468] translate German comments, removing redundant ones

2015-08-30 Thread bugzilla-daemon

https://bugs.documentfoundation.org/show_bug.cgi?id=39468

--- Comment #199 from Commit Notification 
 ---
Luc Castermans committed a patch related to this issue.
It has been pushed to "master":

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

tdf#39468 Translate German comments

It will be available in 5.1.0.

The patch should be included in the daily builds available at
http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More
information about daily builds can be found at:
http://wiki.documentfoundation.org/Testing_Daily_Builds
Affected users are encouraged to test the fix and report feedback.

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: include/svx

2015-08-30 Thread Luc Castermans

 include/svx/svdmrkv.hxx |   14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 76c7c225ff79458c96477b6dc7d2488348772025
Author: Luc Castermans 
Date:   Sun Aug 30 10:15:14 2015 +0200

tdf#39468 Translate German comments

Change-Id: I77702f7e68dd99c9715b4ca8ca2a6b34fd3452cf
Reviewed-on: https://gerrit.libreoffice.org/18140
Reviewed-by: Norbert Thiebaud 
Tested-by: Norbert Thiebaud 

diff --git a/include/svx/svdmrkv.hxx b/include/svx/svdmrkv.hxx
index 966c7c5..2f0e6ddf 100644
--- a/include/svx/svdmrkv.hxx
+++ b/include/svx/svdmrkv.hxx
@@ -73,7 +73,7 @@ enum SdrHitKind {SDRHIT_NONE,  // No hit
  SDRHIT_GLUEPOINT,   // Glue point
  SDRHIT_TEXTEDIT,// Open OutlinerView was hit
  SDRHIT_TEXTEDITOBJ, // Object for SdrBeginTextEdit 
(Textbereich)
- SDRHIT_URLFIELD,// Field im TextObj was hit (while it 
is currently not edited)
+ SDRHIT_URLFIELD,// Field in TextObj was hit (while it 
is currently not edited)
  SDRHIT_MACRO,   // Object for BegMacroObj
  SDRHIT_MARKEDOBJECT,// Marked object (e.g. for dragging)
  SDRHIT_UNMARKEDOBJECT, // non-marked Object (e.g. for marking)
@@ -121,17 +121,17 @@ protected:
 sal_uIntPtr mnInsPointNum;  // Number of the InsPoint
 sal_uIntPtr mnMarkableObjCount;
 
-SdrDragMode meDragMode;// Persistent
+SdrDragMode meDragMode;  // Persistent
 SdrViewEditMode meEditMode;  // Persistent
 SdrViewEditMode meEditMode0; // Persistent
 
 //HMHbool   bHdlShown : 1;
-boolmbRefHdlShownOnly : 1; // Axis of reflextion 
during dragging (ni)
-boolmbDesignMode : 1;  // DesignMode for 
SdrUnoObj
-boolmbForceFrameHandles : 1; // Persistent - 
FrameDrag auch bei Einzelobjekten
-boolmbPlusHdlAlways : 1;   // Persistent
+boolmbRefHdlShownOnly : 1; // Axis of 
reflextion during dragging (ni)
+boolmbDesignMode : 1;  // DesignMode for 
SdrUnoObj
+boolmbForceFrameHandles : 1;   // Persistent - 
FrameDrag also for single objects
+boolmbPlusHdlAlways : 1;   // Persistent
 boolmbMarkHdlWhenTextEdit : 1; // Persistent, 
default=FALSE
-boolmbInsPolyPoint : 1; // at this time 
InsPolyPointDragging
+boolmbInsPolyPoint : 1;// at this time 
InsPolyPointDragging
 boolmbMarkedObjRectDirty : 1;
 boolmbMrkPntDirty : 1;
 boolmbMarkedPointsRectsDirty : 1;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: wizards/source

2015-08-30 Thread Jean-Pierre Ledure

 wizards/source/access2base/DoCmd.xba |   14 +---
 wizards/source/access2base/Utils.xba |  104 +++
 2 files changed, 108 insertions(+), 10 deletions(-)

New commits:
commit 02973251c20df031fad85b7b25a405e86d84596f
Author: Jean-Pierre Ledure 
Date:   Sun Aug 30 16:27:24 2015 +0200

Access2Base - UTF-8 encoding and %-encoding

Application to SendMailWithoutAttachment => "mailto: ... " uri

Change-Id: I53aa0325c048dca678ff134908d448afab08933d

diff --git a/wizards/source/access2base/DoCmd.xba 
b/wizards/source/access2base/DoCmd.xba
index ce20dac..28e2bc3 100644
--- a/wizards/source/access2base/DoCmd.xba
+++ b/wizards/source/access2base/DoCmd.xba
@@ -2420,29 +2420,23 @@ Private Function _SendWithoutAttachment(ByVal pvTo As 
Variant _
, ByVal psBody As String _
) As Boolean
 'Send simple message with mailto: syntax
-Dim sMailTo As String, sTo As String, sCc As String, sBcc As String, sSubject 
As String, sBody As String, oDispatch As Object
+Dim sMailTo As String, sTo As String, sCc As String, sBcc As String, oDispatch 
As Object
 Const cstComma = ","
-Const cstSpace = "%20"
-Const cstLF = "%0A"
 
If _ErrorHandler() Then On Local Error Goto Error_Function
 
If UBound(pvTo) >= 0 Then sTo = Trim(Join(pvTo, cstComma))   Else 
sTo = ""
If UBound(pvCc) >= 0 Then sCc = Trim(Join(pvCc, cstComma))   Else 
sCc = ""
If UBound(pvBcc) >= 0Then sBcc = Trim(Join(pvBcc, cstComma)) 
Else sBcc = ""
-   If psSubject <> ""  Then sSubject = 
Join(Split(psSubject, " "), cstSpace) Else sSubject = ""
-   If psBody <> "" Then
-   sBody = Join(Split(Join(Split(psBody, Chr(13)), ""), 
Chr(10), cstLF)
-   sBody = Join(Split(sBody, " "), cstSpace)
-   End If

sMailTo = "mailto:"; _
& sTo & "?" _
& Iif(sCc = "", "", 
"cc=" & sCc & "&") _
& Iif(sBcc = "", "", 
"bcc=" & sBcc & "&") _
-   & Iif(sSubject = "", 
"", "subject=" & sSubject & "&") _
-   & Iif(sBody = "", "", 
"body=" & sBody & "&")
+   & Iif(psSubject = "", 
"", "subject=" & psSubject & "&") _
+   & Iif(psBody = "", "", 
"body=" & psBody & "&")
If Right(sMailTo, 1) = "&" Or Right(sMailTo, 1) = 
"?" Then sMailTo = Left(sMailTo, Len(sMailTo) - 1)
+   sMailTo = Utils._URLEncode(sMailTo)

oDispatch = createUnoService( 
"com.sun.star.frame.DispatchHelper")
oDispatch.executeDispatch(StarDesktop, sMailTo, "", 0, 
Array())
diff --git a/wizards/source/access2base/Utils.xba 
b/wizards/source/access2base/Utils.xba
index 256ff85..321db78 100644
--- a/wizards/source/access2base/Utils.xba
+++ b/wizards/source/access2base/Utils.xba
@@ -586,6 +586,42 @@ Dim vSubStrings() As Variant, i As Integer, iLen As Integer
 End Function   '  PCase   V0.9.0
 
 REM 
---
+Private Function _PercentEncode(ByVal psChar As String) As String
+' Percent encoding of single psChar character
+' https://en.wikipedia.org/wiki/UTF-8
+
+Dim lChar As Long, sByte1 As String, sByte2 As String, sByte3 As String
+   lChar = Asc(psChar)
+   
+   Select Case lChar
+   Case 48 To 57, 65 To 90, 97 To 122  '  0-9, 
A-Z, a-z
+   _PercentEncode = psChar
+   Case "-", ".", "_", "~"
+   _PercentEncode = psChar
+   Case "!", "$", "&", 
"'", "(", ")", "*", "+", 
",", ";", "="   '  Reserved 
characters used as delimitors in query strings
+   _PercentEncode = psChar
+   Case " ", "%"
+   _PercentEncode = "%" & 
Right("00" & Hex(lChar), 2)
+   Case 0 To 127
+   _PercentEncode = psChar
+   Case 128 To 2047
+   sByte1 = "%" & Right("00" & 
Hex(Int(lChar / 64) + 192), 2)
+   sByte2 = "%" & Right("00" & 
Hex((lChar Mod 64) + 128), 2)
+   _PercentEncode = sByte1 & sByte2
+   Case 2048 To 65535
+   sByte1 = "%" & Right("00" & 
Hex(Int(lChar / 4096) + 224), 2)
+   sByte2 = "%" & Right("00" & 
Hex(Int(lChar - (4096 * Int(lChar / 4096))) /64 + 128), 2)
+   sByte3 = "%" & Right("00" & 
Hex((lChar Mod 64) + 128), 2)
+   _PercentEncode = sByte1 & sByte2 & sByte3
+   Case Else   '  Not supported
+   _PercentEncode = psChar
+   End Select
+   
+   Exit Function
+
+End Function   '  _PercentEncode V1.4.0
+
+REM

Re: unit test fails in writerperfect

2015-08-30 Thread Ashod Nakashian

On Sun, Aug 30, 2015 at 8:39 AM, Regina Henschel 
wrote:

> Hi David,
>
> David Tardon schrieb:
>
>> So it is a segfault, not a unit test failure... Could you get a stack
>> trace?
>>
>
> I think no. I have never done it. I would need a step-by-step description
> for dummies.
>
>
Regina, you can debug in visual studio using the following command:

CPPUNITTRACE="\"C:/Program Files (x86)/Microsoft Visual Studio
12.0/Common7/IDE/devenv.exe\" /debugexe" /opt/lo/bin/make 

You need to correct the path to devenv and find the test_name that is
failing. You should find it near the end of the output. They all start with
'CppunitTest_'.

When you run the above command, it will run the failing unittest from
within visual studio, which will break when it crashes. This will give you
an opportunity to inspect the stack trace (from the stack debug window) and
also see the code and line where it faults (if inside LO codebase).

Let me know if you need more help.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: canvas/source

2015-08-30 Thread Daniel Robertson

 canvas/source/directx/dx_config.cxx  |7 --
 canvas/source/opengl/ogl_canvashelper.cxx|   54 ---
 canvas/source/opengl/ogl_texturecache.cxx|   22 +++--
 canvas/source/tools/canvascustomspritehelper.cxx |9 +--
 canvas/source/tools/page.cxx |   16 +-
 canvas/source/tools/pagemanager.cxx  |   17 +--
 canvas/source/tools/spriteredrawmanager.cxx  |   33 +-
 7 files changed, 54 insertions(+), 104 deletions(-)

New commits:
commit b7f4940c150b3bdd639afa988573a29774fff1f6
Author: Daniel Robertson 
Date:   Tue Aug 25 12:24:33 2015 -0400

canvas: replace while loops with range-based for

Change-Id: Ide16bee666cf4df41646f9336a585e22a7fe53bd
Reviewed-on: https://gerrit.libreoffice.org/18131
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/canvas/source/directx/dx_config.cxx 
b/canvas/source/directx/dx_config.cxx
index e4abde4..be4c3c7 100644
--- a/canvas/source/directx/dx_config.cxx
+++ b/canvas/source/directx/dx_config.cxx
@@ -102,11 +102,9 @@ namespace dxcanvas
 uno::Sequence< sal_Int32 > aValues( 
sizeof(DeviceInfo)/sizeof(sal_Int32)*maValues.size() );
 
 sal_Int32* pValues = aValues.getArray();
-ValueSet::const_iterator aIter( maValues.begin() );
-const ValueSet::const_iterator aEnd( maValues.end() );
-while( aIter != aEnd )
+for( const auto& rValueSet : maValues )
 {
-const DeviceInfo& rInfo( *aIter );
+const DeviceInfo& rInfo( rValueSet );
 *pValues++ = rInfo.nVendorId;
 *pValues++ = rInfo.nDeviceId;
 *pValues++ = rInfo.nDeviceSubSysId;
@@ -115,7 +113,6 @@ namespace dxcanvas
 *pValues++ = rInfo.nDriverVersion;
 *pValues++ = rInfo.nDriverSubVersion;
 *pValues++ = rInfo.nDriverBuildId;
-++aIter;
 }
 
 uno::Sequence< uno::Any > aValue(1);
diff --git a/canvas/source/opengl/ogl_canvashelper.cxx 
b/canvas/source/opengl/ogl_canvashelper.cxx
index 1534f7c..61a6773 100644
--- a/canvas/source/opengl/ogl_canvashelper.cxx
+++ b/canvas/source/opengl/ogl_canvashelper.cxx
@@ -139,10 +139,8 @@ namespace oglcanvas
 TransformationPreserver aPreserver;
 setupState(rTransform, eSrcBlend, eDstBlend, rColor);
 
-::basegfx::B2DPolyPolygonVector::const_iterator 
aCurr=rPolyPolygons.begin();
-const ::basegfx::B2DPolyPolygonVector::const_iterator 
aEnd=rPolyPolygons.end();
-while( aCurr != aEnd )
-renderPolyPolygon(*aCurr++);
+for( const auto& rPoly : rPolyPolygons )
+renderPolyPolygon( rPoly );
 
 return true;
 }
@@ -157,12 +155,10 @@ namespace oglcanvas
 TransformationPreserver aPreserver;
 setupState(rTransform, eSrcBlend, eDstBlend, rColor);
 
-::basegfx::B2DPolyPolygonVector::const_iterator 
aCurr=rPolyPolygons.begin();
-const ::basegfx::B2DPolyPolygonVector::const_iterator 
aEnd=rPolyPolygons.end();
-while( aCurr != aEnd )
+for( const auto& rPoly : rPolyPolygons )
 {
-glBegin(GL_TRIANGLES);
-renderComplexPolyPolygon(*aCurr++);
+glBegin( GL_TRIANGLES );
+renderComplexPolyPolygon( rPoly );
 glEnd();
 }
 
@@ -186,10 +182,8 @@ namespace oglcanvas
 ::basegfx::unotools::homMatrixFromAffineMatrix( aTextureTransform,
 
rTexture.AffineTransform );
 ::basegfx::B2DRange aBounds;
-::basegfx::B2DPolyPolygonVector::const_iterator 
aCurr=rPolyPolygons.begin();
-const ::basegfx::B2DPolyPolygonVector::const_iterator 
aEnd=rPolyPolygons.end();
-while( aCurr != aEnd )
-aBounds.expand(::basegfx::tools::getRange(*aCurr++));
+for( const auto& rPoly : rPolyPolygons )
+aBounds.expand( ::basegfx::tools::getRange( rPoly ) );
 aTextureTransform.translate(-aBounds.getMinX(), 
-aBounds.getMinY());
 aTextureTransform.scale(1/aBounds.getWidth(), 
1/aBounds.getHeight());
 
@@ -228,11 +222,10 @@ namespace oglcanvas
 }
 
 
-aCurr=rPolyPolygons.begin();
-while( aCurr != aEnd )
+for( const auto& rPoly : rPolyPolygons )
 {
 glBegin(GL_TRIANGLES);
-renderComplexPolyPolygon(*aCurr++);
+renderComplexPolyPolygon( rPoly );
 glEnd();
 }
 
@@ -333,10 +326,8 @@ namespace oglcanvas
 ::basegfx::unotools::homMatrixFromAffineMatrix( aTextureTransform,
 
rTexture.AffineTransform );

[Libreoffice-commits] core.git: include/vcl vcl/source

2015-08-30 Thread Daniel Robertson

 include/vcl/gradient.hxx|   10 ++--
 vcl/source/gdi/gradient.cxx |   94 +---
 2 files changed, 26 insertions(+), 78 deletions(-)

New commits:
commit 49cb81b411e1c68cada5d3f4375de713118fce64
Author: Daniel Robertson 
Date:   Fri Aug 28 22:53:28 2015 -0400

tdf#62525 vcl: use cow_wrapper for Gradient

Convert the pimpled copy-on-write Gradient class from vcl to use
::o3tl::cow_wrapper using the default reference counting policy.

Change-Id: Iadf4d2288669e58a4d5b41f436978c3ab34216f3
Reviewed-on: https://gerrit.libreoffice.org/18124
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/include/vcl/gradient.hxx b/include/vcl/gradient.hxx
index 10b16e4..3f2404b 100644
--- a/include/vcl/gradient.hxx
+++ b/include/vcl/gradient.hxx
@@ -25,6 +25,7 @@
 #include 
 
 #include 
+#include 
 
 
 // - Impl_Gradient -
@@ -52,8 +53,10 @@ public:
 friend SvStream& ReadImpl_Gradient( SvStream& rIStm, Impl_Gradient& 
rImplGradient );
 friend SvStream& WriteImpl_Gradient( SvStream& rOStm, const Impl_Gradient& 
rImplGradient );
 
-Impl_Gradient();
-Impl_Gradient( const Impl_Gradient& rImplGradient );
+Impl_Gradient();
+Impl_Gradient( const Impl_Gradient& rImplGradient );
+
+bool operator==( const Impl_Gradient& rImpl_Gradient ) const;
 };
 
 
@@ -63,8 +66,7 @@ public:
 class VCL_DLLPUBLIC Gradient
 {
 private:
-Impl_Gradient*  mpImplGradient;
-voidMakeUnique();
+::o3tl::cow_wrapper< Impl_Gradient >  mpImplGradient;
 
 public:
 Gradient();
diff --git a/vcl/source/gdi/gradient.cxx b/vcl/source/gdi/gradient.cxx
index b8bca2e..5f2c95f 100644
--- a/vcl/source/gdi/gradient.cxx
+++ b/vcl/source/gdi/gradient.cxx
@@ -53,37 +53,36 @@ Impl_Gradient::Impl_Gradient( const Impl_Gradient& 
rImplGradient ) :
 mnStepCount = rImplGradient.mnStepCount;
 }
 
-void Gradient::MakeUnique()
+bool Impl_Gradient::operator==( const Impl_Gradient& rImpl_Gradient ) const
 {
-// If there are still other references, copy
-if ( mpImplGradient->mnRefCount != 1 )
-{
-if( mpImplGradient->mnRefCount )
-mpImplGradient->mnRefCount--;
-
-mpImplGradient = new Impl_Gradient( *mpImplGradient );
-}
+if ( (meStyle   == rImpl_Gradient.meStyle)   &&
+ (mnAngle   == rImpl_Gradient.mnAngle)   &&
+ (mnBorder  == rImpl_Gradient.mnBorder)  &&
+ (mnOfsX== rImpl_Gradient.mnOfsX)&&
+ (mnOfsY== rImpl_Gradient.mnOfsY)&&
+ (mnStepCount   == rImpl_Gradient.mnStepCount)   &&
+ (mnIntensityStart  == rImpl_Gradient.mnIntensityStart)  &&
+ (mnIntensityEnd== rImpl_Gradient.mnIntensityEnd)&&
+ (maStartColor  == rImpl_Gradient.maStartColor)  &&
+ (maEndColor== rImpl_Gradient.maEndColor) )
+ return true;
+return false;
 }
 
-Gradient::Gradient()
+Gradient::Gradient() :
+mpImplGradient()
 {
-
-mpImplGradient = new Impl_Gradient;
 }
 
-Gradient::Gradient( const Gradient& rGradient )
+Gradient::Gradient( const Gradient& rGradient ) :
+mpImplGradient( rGradient.mpImplGradient )
 {
-
-// Take over instance data and increment refcount
-mpImplGradient = rGradient.mpImplGradient;
-mpImplGradient->mnRefCount++;
 }
 
 Gradient::Gradient( GradientStyle eStyle,
-const Color& rStartColor, const Color& rEndColor )
+const Color& rStartColor, const Color& rEndColor ) :
+mpImplGradient()
 {
-
-mpImplGradient  = new Impl_Gradient;
 mpImplGradient->meStyle = eStyle;
 mpImplGradient->maStartColor= rStartColor;
 mpImplGradient->maEndColor  = rEndColor;
@@ -91,82 +90,55 @@ Gradient::Gradient( GradientStyle eStyle,
 
 Gradient::~Gradient()
 {
-
-// If it's the last reference, delete it, otherwise
-// decrement refcount
-if ( mpImplGradient->mnRefCount == 1 )
-delete mpImplGradient;
-else
-mpImplGradient->mnRefCount--;
 }
 
 void Gradient::SetStyle( GradientStyle eStyle )
 {
-
-MakeUnique();
 mpImplGradient->meStyle = eStyle;
 }
 
 void Gradient::SetStartColor( const Color& rColor )
 {
-
-MakeUnique();
 mpImplGradient->maStartColor = rColor;
 }
 
 void Gradient::SetEndColor( const Color& rColor )
 {
-
-MakeUnique();
 mpImplGradient->maEndColor = rColor;
 }
 
 void Gradient::SetAngle( sal_uInt16 nAngle )
 {
-
-MakeUnique();
 mpImplGradient->mnAngle = nAngle;
 }
 
 void Gradient::SetBorder( sal_uInt16 nBorder )
 {
-
-MakeUnique();
 mpImplGradient->mnBorder = nBorder;
 }
 
 void Gradient::SetOfsX( sal_uInt16 nOfsX )
 {
-
-MakeUnique();
 mpImplGradient->mnOfsX = nOfsX;
 }
 
 void Gradient::SetOfsY( sal_uInt16 nOfsY )
 {
-
-MakeUnique();
 mpImplGradient-

[Bug 62525] Convert manual refcounting / copy-on-write implementations to cow_wrapper

2015-08-30 Thread bugzilla-daemon

https://bugs.documentfoundation.org/show_bug.cgi?id=62525

--- Comment #27 from Commit Notification 
 ---
Daniel Robertson committed a patch related to this issue.
It has been pushed to "master":

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

tdf#62525 vcl: use cow_wrapper for Gradient

It will be available in 5.1.0.

The patch should be included in the daily builds available at
http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More
information about daily builds can be found at:
http://wiki.documentfoundation.org/Testing_Daily_Builds
Affected users are encouraged to test the fix and report feedback.

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Bug 62525] Convert manual refcounting / copy-on-write implementations to cow_wrapper

2015-08-30 Thread bugzilla-daemon

https://bugs.documentfoundation.org/show_bug.cgi?id=62525

Commit Notification  changed:

   What|Removed |Added

 Whiteboard|EasyHack|EasyHack
   |DifficultyInteresting   |DifficultyInteresting
   |SkillCpp TopicCleanup   |SkillCpp TopicCleanup
   |target:4.1.0 target:5.0.0   |target:4.1.0 target:5.0.0
   ||target:5.1.0

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Bug 62525] Convert manual refcounting / copy-on-write implementations to cow_wrapper

2015-08-30 Thread bugzilla-daemon

https://bugs.documentfoundation.org/show_bug.cgi?id=62525

--- Comment #26 from Commit Notification 
 ---
Daniel Robertson committed a patch related to this issue.
It has been pushed to "master":

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

tdf#62525: use cow_wrapper for SvGlobalName

It will be available in 5.1.0.

The patch should be included in the daily builds available at
http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More
information about daily builds can be found at:
http://wiki.documentfoundation.org/Testing_Daily_Builds
Affected users are encouraged to test the fix and report feedback.

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: include/tools tools/source

2015-08-30 Thread Daniel Robertson

 include/tools/globname.hxx|   60 
 tools/source/ref/globname.cxx |   90 ++
 2 files changed, 57 insertions(+), 93 deletions(-)

New commits:
commit c1a9d0139112d7489ca6dd29b18f9418c6da3085
Author: Daniel Robertson 
Date:   Thu Aug 27 16:27:33 2015 -0400

tdf#62525: use cow_wrapper for SvGlobalName

Convert the pimpled copy-on-write SvGlobalName class to use the
::o3tl::cow_wrapper using the default reference counting policy.

Change-Id: I7bceb06ddfb31ca5901e5e7d5d93dda494db945f
Reviewed-on: https://gerrit.libreoffice.org/18070
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/include/tools/globname.hxx b/include/tools/globname.hxx
index 6796c3b..42ff4f4 100644
--- a/include/tools/globname.hxx
+++ b/include/tools/globname.hxx
@@ -23,6 +23,7 @@
 
 #include 
 #include 
+#include 
 
 struct SvGUID
 {
@@ -35,20 +36,16 @@ struct SvGUID
 struct ImpSvGlobalName
 {
 struct SvGUID   szData;
-sal_uInt16  nRefCount;
 
-enum Empty { EMPTY };
-
-ImpSvGlobalName(const SvGUID &rData)
-: szData(rData)
-, nRefCount(0)
-{
-}
-ImpSvGlobalName(sal_uInt32 n1, sal_uInt16 n2, sal_uInt16 n3,
-  sal_uInt8 b8, sal_uInt8 b9, sal_uInt8 b10, sal_uInt8 
b11,
-  sal_uInt8 b12, sal_uInt8 b13, sal_uInt8 b14, 
sal_uInt8 b15);
-ImpSvGlobalName( const ImpSvGlobalName & rObj );
-ImpSvGlobalName( Empty );
+ImpSvGlobalName(const SvGUID &rData)
+: szData(rData)
+{
+}
+ImpSvGlobalName(sal_uInt32 n1, sal_uInt16 n2, sal_uInt16 n3,
+  sal_uInt8 b8, sal_uInt8 b9, sal_uInt8 b10, sal_uInt8 b11,
+  sal_uInt8 b12, sal_uInt8 b13, sal_uInt8 b14, sal_uInt8 b15);
+ImpSvGlobalName( const ImpSvGlobalName & rObj );
+ImpSvGlobalName();
 
 booloperator == ( const ImpSvGlobalName & rObj ) const;
 };
@@ -57,30 +54,26 @@ class SvStream;
 
 class TOOLS_DLLPUBLIC SvGlobalName
 {
-ImpSvGlobalName * pImp;
-voidNewImp();
+::o3tl::cow_wrapper< ImpSvGlobalName > pImp;
 
 public:
-SvGlobalName();
-SvGlobalName( const SvGlobalName & rObj )
-{
-pImp = rObj.pImp;
-pImp->nRefCount++;
-}
-SvGlobalName( ImpSvGlobalName * pImpP )
-{
-pImp = pImpP;
-pImp->nRefCount++;
-}
-SvGlobalName( sal_uInt32 n1, sal_uInt16 n2, sal_uInt16 n3,
-  sal_uInt8 b8, sal_uInt8 b9, sal_uInt8 b10, sal_uInt8 
b11,
-  sal_uInt8 b12, sal_uInt8 b13, sal_uInt8 b14, 
sal_uInt8 b15 );
-
-// create SvGlobalName from a platform independent representation
-SvGlobalName( const ::com::sun::star::uno::Sequence< sal_Int8 >& 
aSeq );
+SvGlobalName();
+SvGlobalName( const SvGlobalName & rObj ) :
+pImp( rObj.pImp )
+{
+}
+
+SvGlobalName( sal_uInt32 n1, sal_uInt16 n2, sal_uInt16 n3,
+  sal_uInt8 b8, sal_uInt8 b9, sal_uInt8 b10, sal_uInt8 b11,
+  sal_uInt8 b12, sal_uInt8 b13, sal_uInt8 b14, sal_uInt8 b15 );
+
+// create SvGlobalName from a platform independent representation
+SvGlobalName( const ::com::sun::star::uno::Sequence< sal_Int8 >& aSeq );
+
+SvGlobalName( const SvGUID & rId );
 
 SvGlobalName & operator = ( const SvGlobalName & rObj );
-~SvGlobalName();
+~SvGlobalName();
 
 TOOLS_DLLPUBLIC friend SvStream & operator >> ( SvStream &, SvGlobalName & 
);
 TOOLS_DLLPUBLIC friend SvStream & WriteSvGlobalName( SvStream &, const 
SvGlobalName & );
@@ -97,7 +90,6 @@ public:
 bool  MakeId( const OUString & rId );
 OUString  GetHexName() const;
 
-  SvGlobalName( const SvGUID & rId );
 const SvGUID& GetCLSID() const { return pImp->szData; }
 
 // platform independent representation of a "GlobalName"
diff --git a/tools/source/ref/globname.cxx b/tools/source/ref/globname.cxx
index fe96048..b11e21f 100644
--- a/tools/source/ref/globname.cxx
+++ b/tools/source/ref/globname.cxx
@@ -27,22 +27,19 @@
 #include 
 
 // ImpSvGlobalName 
-ImpSvGlobalName::ImpSvGlobalName( const ImpSvGlobalName & rObj )
-: szData(rObj.szData)
-, nRefCount(0)
+ImpSvGlobalName::ImpSvGlobalName()
 {
+memset( &szData, 0, sizeof( szData ) );
 }
 
-ImpSvGlobalName::ImpSvGlobalName( Empty )
-: nRefCount(1)
+ImpSvGlobalName::ImpSvGlobalName( const ImpSvGlobalName & rObj )
+: szData(rObj.szData)
 {
-memset( &szData, 0, sizeof( szData ) );
 }
 
 ImpSvGlobalName::ImpSvGlobalName(sal_uInt32 n1, sal_uInt16 n2, sal_uInt16 n3,
   sal_uInt8 b8, sal_uInt8 b9, sal_uInt8 b10, sal_uInt8 
b1

Re: unit test fails in writerperfect

2015-08-30 Thread Regina Henschel


Hi David,

David Tardon schrieb:

Hi,

On Sun, Aug 30, 2015 at 02:05:07PM +0200, Regina Henschel wrote:

Hi David,

David Tardon schrieb:

Hi,

On Sat, Aug 29, 2015 at 04:56:02PM +0200, Regina Henschel wrote:

Hi all,

my current build fails in writerperfect. It has build
Version: 5.1.0.0.alpha1+
Build ID: 51c3a6421ecdb3443121c26e3bdeb21b07bd1fd8
Locale: de-DE (de_DE)

But unit test fails in writerperfect.
make[1]: ***
[C:/LO_devhelp/core/workdir/CppunitTest/writerperfect_writer.test] Error 1


Could you include more lines of the log? I need to know on which file
the test failed. Also, if you are building with system libwps or
libmwaw, which versions do you have?



I have put a log to http://pastebin.ca/3138459


So it is a segfault, not a unit test failure... Could you get a stack trace?


I think no. I have never done it. I would need a step-by-step 
description for dummies.


Kind regards
Regina

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

Re: unit test fails in writerperfect

2015-08-30 Thread David Tardon

Hi,

On Sun, Aug 30, 2015 at 02:05:07PM +0200, Regina Henschel wrote:
> Hi David,
> 
> David Tardon schrieb:
> >Hi,
> >
> >On Sat, Aug 29, 2015 at 04:56:02PM +0200, Regina Henschel wrote:
> >>Hi all,
> >>
> >>my current build fails in writerperfect. It has build
> >>Version: 5.1.0.0.alpha1+
> >>Build ID: 51c3a6421ecdb3443121c26e3bdeb21b07bd1fd8
> >>Locale: de-DE (de_DE)
> >>
> >>But unit test fails in writerperfect.
> >>make[1]: ***
> >>[C:/LO_devhelp/core/workdir/CppunitTest/writerperfect_writer.test] Error 1
> >
> >Could you include more lines of the log? I need to know on which file
> >the test failed. Also, if you are building with system libwps or
> >libmwaw, which versions do you have?
> >
> 
> I have put a log to http://pastebin.ca/3138459

So it is a segfault, not a unit test failure... Could you get a stack trace?

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

Re: unit test fails in writerperfect

2015-08-30 Thread Regina Henschel


Hi David,

David Tardon schrieb:

Hi,

On Sat, Aug 29, 2015 at 04:56:02PM +0200, Regina Henschel wrote:

Hi all,

my current build fails in writerperfect. It has build
Version: 5.1.0.0.alpha1+
Build ID: 51c3a6421ecdb3443121c26e3bdeb21b07bd1fd8
Locale: de-DE (de_DE)

But unit test fails in writerperfect.
make[1]: ***
[C:/LO_devhelp/core/workdir/CppunitTest/writerperfect_writer.test] Error 1


Could you include more lines of the log? I need to know on which file
the test failed. Also, if you are building with system libwps or
libmwaw, which versions do you have?



I have put a log to http://pastebin.ca/3138459

Kind regards
Regina

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

[Libreoffice-commits] libvisio.git: src/lib

2015-08-30 Thread David Tardon

 src/lib/Makefile.am |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 2968c3dff8572b4734cb42c7bd5b00222f7fb288
Author: David Tardon 
Date:   Sun Aug 30 13:59:23 2015 +0200

fix build with boost 1.59

Change-Id: I21eebdfa99d379e57949bfe4bf7eb83aec16f916

diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index dc0f8fd..6946b0a 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -22,6 +22,7 @@ generated_files = \
$(top_builddir)/src/lib/tokens.h \
$(top_builddir)/src/lib/tokenhash.h
 
+libvisio_@VSD_MAJOR_VERSION@_@VSD_MINOR_VERSION@_la_CPPFLAGS = 
-DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED
 libvisio_@VSD_MAJOR_VERSION@_@VSD_MINOR_VERSION@_la_LIBADD  = $(LIBVISIO_LIBS) 
@LIBVISIO_WIN32_RESOURCE@
 libvisio_@VSD_MAJOR_VERSION@_@VSD_MINOR_VERSION@_la_DEPENDENCIES = 
@LIBVISIO_WIN32_RESOURCE@
 libvisio_@VSD_MAJOR_VERSION@_@VSD_MINOR_VERSION@_la_LDFLAGS = $(version_info) 
-export-dynamic -no-undefined
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: unit test fails in writerperfect

2015-08-30 Thread Regina Henschel


Hi David,

David Tardon schrieb:

Hi,

On Sat, Aug 29, 2015 at 04:56:02PM +0200, Regina Henschel wrote:

Hi all,

my current build fails in writerperfect. It has build
Version: 5.1.0.0.alpha1+
Build ID: 51c3a6421ecdb3443121c26e3bdeb21b07bd1fd8
Locale: de-DE (de_DE)

But unit test fails in writerperfect.
make[1]: ***
[C:/LO_devhelp/core/workdir/CppunitTest/writerperfect_writer.test] Error 1


Could you include more lines of the log? I need to know on which file
the test failed. Also, if you are building with system libwps or
libmwaw, which versions do you have?

D.



I build on Windows 7 with Visual Studio Community 2013.

Jenkins fails on Windows for the same reason.

I've currently no log; need some time to generate it.

Kind regards
Regina


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

Re: unit test fails in writerperfect

2015-08-30 Thread David Tardon

Hi,

On Sat, Aug 29, 2015 at 04:56:02PM +0200, Regina Henschel wrote:
> Hi all,
> 
> my current build fails in writerperfect. It has build
> Version: 5.1.0.0.alpha1+
> Build ID: 51c3a6421ecdb3443121c26e3bdeb21b07bd1fd8
> Locale: de-DE (de_DE)
> 
> But unit test fails in writerperfect.
> make[1]: ***
> [C:/LO_devhelp/core/workdir/CppunitTest/writerperfect_writer.test] Error 1

Could you include more lines of the log? I need to know on which file
the test failed. Also, if you are building with system libwps or
libmwaw, which versions do you have?

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

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - vcl/source

2015-08-30 Thread Michael Meeks

 vcl/source/window/stacking.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 18d447443d160c40d42621644b557eecc42ee765
Author: Michael Meeks 
Date:   Sat Aug 29 23:52:06 2015 +0100

tdf#93536 - avoid crash when calling ToTop on disposed window.

Change-Id: I677f47f6b60271dc56c9d3d123cf982c00866eb9
Reviewed-on: https://gerrit.libreoffice.org/18136
Reviewed-by: Maxim Monastirsky 
Tested-by: Maxim Monastirsky 

diff --git a/vcl/source/window/stacking.cxx b/vcl/source/window/stacking.cxx
index dc0f78e..52d9685 100644
--- a/vcl/source/window/stacking.cxx
+++ b/vcl/source/window/stacking.cxx
@@ -438,6 +438,8 @@ void Window::ImplHideAllOverlaps()
 
 void Window::ToTop( sal_uInt16 nFlags )
 {
+if (!mpWindowImpl)
+return;
 
 ImplStartToTop( nFlags );
 ImplFocusToTop( nFlags, IsReallyVisible() );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[LIbreOffice][SDK] Help needed for a wrapper library written over LibreOffice SDK

2015-08-30 Thread Anurag Ghosh

Hey everyone!

I'm Anurag Ghosh, and I have been working on writing a library which
wraps Libreoffice and MS office API's into a clean interface in C++,
with the aim of submitting it into Boost C++ Libraries (I worked on it
as a part of my GSoC Project with Boost).

I encountered certain issues while working with the Libre Office SDK -

1. I could not find any way of clearing the Cell Contents of a single
cell using either XCell interface or any other interface which could
be instantiated from XCell. The closest was the XCellRange which had
clearContents() method. Could anyone help me out with how a single
cell can be cleared efficiently (such that the xCell->getType()
returns CellContentType_EMPTY after being cleared) ?

2. Also, I installed libreoffice and libreoffice-sdk on my ubuntu and
generated the includes using cppumaker. My tests run when the library
is compiled using gcc 4.6+ however with clang 3.3+, multi document
tests fail (tests which open multiple documents in a single program
simultaneously). Is this a known issue or there is some bug in my code
causing this ?

I'm sorry if this is considered as spam here. It would be great if
someone could help me here with the issues, also, any feedback on my
library would be very helpful.

The code base can be found at
https://github.com/anuragxel/boost-document. (If anyone could skim
through the code base once and suggest improvements, that would be
awesome.)

Thank You

Anurag Ghosh
github.com/anuragxel
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 5 commits - cppu/prj cppu/qa desktop/qa o3tl/qa

2015-08-30 Thread Damjan Jovanovic

 cppu/prj/build.lst |1 
 cppu/qa/main.cxx   |   28 
 cppu/qa/makefile.mk|   69 -
 cppu/qa/test_any.cxx   | 1241 +++--
 cppu/qa/test_recursion.cxx |   17 
 cppu/qa/test_reference.cxx |   31 
 cppu/qa/test_unotype.cxx   |  456 -
 cppu/qa/version.map|   30 
 desktop/qa/deployment_misc/main.cxx|   28 
 desktop/qa/deployment_misc/makefile.mk |   36 
 desktop/qa/deployment_misc/test_dp_version.cxx |   21 
 desktop/qa/deployment_misc/version.map |   30 
 o3tl/qa/export.map |   30 
 o3tl/qa/main.cxx   |   28 
 o3tl/qa/makefile.mk|   53 -
 o3tl/qa/test-cow_wrapper.cxx   |  161 +--
 o3tl/qa/test-heap_ptr.cxx  |  202 +---
 o3tl/qa/test-range.cxx |  214 ++--
 o3tl/qa/test-vector_pool.cxx   |   80 -
 19 files changed, 1231 insertions(+), 1525 deletions(-)

New commits:
commit 61224f2be25942cee9f506f5311c619539c8
Author: Damjan Jovanovic 
Date:   Sun Aug 30 09:09:06 2015 +

#i125003# migrate main/o3tl from cppunit to Google Test

diff --git a/o3tl/qa/export.map b/o3tl/qa/export.map
deleted file mode 100644
index ec49c45..000
--- a/o3tl/qa/export.map
+++ /dev/null
@@ -1,30 +0,0 @@
-#**
-#
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#
-#http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#
-#**
-
-
-
-UDK_3_0_0 {
-global:
-cppunitTestPlugIn;
-
-local:
-*;
-};
diff --git a/o3tl/qa/main.cxx b/o3tl/qa/main.cxx
new file mode 100644
index 000..df14e5b
--- /dev/null
+++ b/o3tl/qa/main.cxx
@@ -0,0 +1,28 @@
+/**
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+#include "gtest/gtest.h"
+
+int main(int argc, char **argv)
+{
+::testing::InitGoogleTest(&argc, argv);
+return RUN_ALL_TESTS();
+}
diff --git a/o3tl/qa/makefile.mk b/o3tl/qa/makefile.mk
index 7693185..419694a 100644
--- a/o3tl/qa/makefile.mk
+++ b/o3tl/qa/makefile.mk
@@ -20,73 +20,48 @@
 #**
 
 
-
-.IF "$(WITH_CPPUNIT)" != "YES" || "$(GUI)" == "OS2"
-
-@all:
-.IF "$(GUI)" == "OS2"
-@echo "Skipping, cppunit broken."
-.ELIF "$(WITH_CPPUNIT)" != "YES"
-@echo "cppunit disabled. nothing do do."
-.END
-
-.ELSE # "$(WITH_CPPUNIT)" != "YES" || "$(GUI)" == "OS2"
-
 PRJ=..
-
 PRJNAME=o3tl
 TARGET=tests
 
 ENABLE_EXCEPTIONS=TRUE
 
+
 # --- Settings -
 
 .INCLUDE :  settings.mk
 
-#building with stlport, but cppunit was not built with stlport
-.IF "$(USE_SYSTEM_STL)"!="YES"
-.IF "$(SYSTEM_CPPUNIT)"=="YES"
-CFLAGSCXX+=-DADAPT_EXT_STL
-.ENDIF
-.ENDIF
+.IF "$(ENABLE_UNIT_TESTS)" != "YES"
+all:
+@echo unit tests are disabled. Nothing to do.
+ 
+.ELSE
 
-CFLAGSCXX += $(CPPUNIT_CFLAGS)
 
 .IF "$(L10N_framework)"==""
 # --- Common --
 
 # BEGIN 
-SHL1OBJS=  \
+APP1OBJS=  \
 $(SLO)$/c

patch sumitted to check my flow/setup

2015-08-30 Thread Luc Castermans

Hi, so I updated/refreshed my local setup and submitted a small patch to see
if the whole flow is working again. If approved I am ready to do more.

https://gerrit.libreoffice.org/#/c/18140/

-- 
Luc Castermans
mailto:luc.casterm...@gmail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] libcdr.git: src/lib

2015-08-30 Thread David Tardon

 src/lib/Makefile.am |1 +
 1 file changed, 1 insertion(+)

New commits:
commit f862293ad576d5f35a3c9e90fba762abeccaa1f0
Author: David Tardon 
Date:   Sun Aug 30 08:42:29 2015 +0200

rhbz#1258127 fix build with boost 1.59

Change-Id: I3c9be843d8fcc17650022f4189b68fde28ee3d42

diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index f8065a8..3f00cc5 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -15,6 +15,7 @@ 
libcdr_@CDR_MAJOR_VERSION@_@CDR_MINOR_VERSION@_include_HEADERS = \
 
 AM_CXXFLAGS = -I$(top_srcdir)/inc $(REVENGE_CFLAGS) $(LCMS2_CFLAGS) 
$(ZLIB_CFLAGS) $(ICU_CFLAGS) $(DEBUG_CXXFLAGS) -DLIBCDR_BUILD=1
 
+libcdr_@CDR_MAJOR_VERSION@_@CDR_MINOR_VERSION@_la_CPPFLAGS = 
-DBOOST_ERROR_CODE_HEADER_ONLY
 libcdr_@CDR_MAJOR_VERSION@_@CDR_MINOR_VERSION@_la_LIBADD  = libcdr-internal.la 
$(REVENGE_LIBS) $(LCMS2_LIBS) $(ZLIB_LIBS) $(ICU_LIBS) @LIBCDR_WIN32_RESOURCE@
 libcdr_@CDR_MAJOR_VERSION@_@CDR_MINOR_VERSION@_la_DEPENDENCIES = 
libcdr-internal.la @LIBCDR_WIN32_RESOURCE@
 libcdr_@CDR_MAJOR_VERSION@_@CDR_MINOR_VERSION@_la_LDFLAGS = $(version_info) 
-export-dynamic -no-undefined
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

60 matches

Mail list logo