[Libreoffice-commits] core.git: Repository.mk scp2/source

[Matúš Kukan]

 Repository.mk   |5 -
 scp2/source/base/postgresqlsdbc.scp |8 
 2 files changed, 4 insertions(+), 9 deletions(-)

New commits:
commit 5662817149e3eed0a592c389042d9c3755629614
Author: Matúš Kukan 
Date:   Fri Dec 23 21:31:18 2016 +0100

tdf#90753: AutoInstall postgresql-sdbc.ini as filelist

Change-Id: I908b549a14c702ce2c33de704b06d016036ccecb
Reviewed-on: https://gerrit.libreoffice.org/32394
Tested-by: Jenkins 
Reviewed-by: Matúš Kukan 

diff --git a/Repository.mk b/Repository.mk
index dcfa393..6423202 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -773,7 +773,6 @@ endif
 $(eval $(call gb_Helper_register_packages, \
test_unittest \
cli_basetypes_copy \
-   $(if $(BUILD_POSTGRESQL_SDBC),connectivity_postgresql-sdbc) \
$(if $(and $(filter MSC,$(COM)),$(ENABLE_CRASHDUMP)),dbghelp) \
desktop_install \
$(if $(filter DESKTOP,$(BUILD_TYPE)),desktop_scripts_install) \
@@ -821,6 +820,10 @@ $(eval $(call gb_Helper_register_packages_for_install,ure,\
) \
 ))
 
+$(eval $(call gb_Helper_register_packages_for_install,postgresqlsdbc,\
+   $(if $(BUILD_POSTGRESQL_SDBC),connectivity_postgresql-sdbc) \
+))
+
 $(eval $(call gb_Helper_register_packages_for_install,sdk,\
odk_share_readme \
odk_share_readme_generated \
diff --git a/scp2/source/base/postgresqlsdbc.scp 
b/scp2/source/base/postgresqlsdbc.scp
index 23bbd44..94e6936 100644
--- a/scp2/source/base/postgresqlsdbc.scp
+++ b/scp2/source/base/postgresqlsdbc.scp
@@ -18,20 +18,12 @@ Module gid_Module_Optional_PostgresqlSdbc
 MOD_NAME_DESC(MODULE_OPTIONAL_POSTGRESQLSDBC);
 ParentID = gid_Module_Prg_Base_Bin;
 Files = (auto_postgresqlsdbc_ALL,
- gid_File_PostgresqlSdbc_Ini,
  gid_File_PostgresqlSdbc_Rdb,
  gid_File_PostgresqlSdbc_Xcd);
 Default = YES;
 Styles = ();
 End
 
-File gid_File_PostgresqlSdbc_Ini
-TXT_FILE_BODY;
-Dir = GID_BRAND_DIR_ETC;
-Name = "postgresql-sdbc.ini";
-Styles = (PACKED);
-End
-
 File gid_File_PostgresqlSdbc_Rdb
 TXT_FILE_BODY;
 Dir = gid_Brand_Dir_Program_Services;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - solenv/src svtools/workben

[Pedro Giffuni]

 solenv/src/version.c|8 
 svtools/workben/cui/loadlib.cxx |6 --
 2 files changed, 14 deletions(-)

New commits:
commit 9feaf73b22cb8ee5ba90440c50d06179f4bce8ba
Author: Pedro Giffuni 
Date:   Sat Dec 24 02:08:28 2016 +

Avoid including some dates in executable files.

Embedding build dates and other environment specific information may
casue gratuitous difference in the resulting binaries, which makes more
difficult security verifications and binary updates.

We currently make no claims but this is the first step to generate
reproducible builds. For more information check:
https://reproducible-builds.org/

While here, since we have been so lazy about updating it, also add the svn
Revision keyword to configure.ac.

diff --git a/solenv/src/version.c b/solenv/src/version.c
index 8db2097..604d83b 100644
--- a/solenv/src/version.c
+++ b/solenv/src/version.c
@@ -28,22 +28,16 @@
 
 struct VersionInfo
 {
-const char* pTime;
-const char* pDate;
 const char* pUpd;
 const char* pMinor;
 const char* pBuild;
-const char* pInpath;
 };
 
 static const struct VersionInfo g_aVersionInfo =
 {
-__TIME__,
-__DATE__,
 _UPD,
 _LAST_MINOR,
 _BUILD,
-_INPATH
 };
 
 #if defined(WNT) || defined(OS2)
@@ -65,8 +59,6 @@ const struct VersionInfo *GetVersionInfo(void)
 int main( int argc, char **argv )
 {
 const VersionInfo *pInfo = GetVersionInfo();
-fprintf( stderr, "Date : %s\n", pInfo->pDate);
-fprintf( stderr, "Time : %s\n", pInfo->pTime);
 fprintf( stderr, "UPD : %s\n", pInfo->pUpd);
 delete pInfo;
 return 0;
diff --git a/svtools/workben/cui/loadlib.cxx b/svtools/workben/cui/loadlib.cxx
index 190fac9..fd34fc2 100644
--- a/svtools/workben/cui/loadlib.cxx
+++ b/svtools/workben/cui/loadlib.cxx
@@ -37,12 +37,9 @@ using namespace rtl;
 extern "C" {
 struct VersionInfo
 {
-const char* pTime;
-const char* pDate;
 const char* pUpd;
 const char* pMinor;
 const char* pBuild;
-const char* pInpath;
 };
 
 typedef VersionInfo*(__LOADONCALLAPI *GetVersionInfo)(void);
@@ -67,12 +64,9 @@ int __LOADONCALLAPI main( int argc, char **argv )
 }
 if ( pInfo )
 {
-fprintf( stdout, "Date : %s\n", pInfo->pDate );
-fprintf( stdout, "Time : %s\n", pInfo->pTime );
 fprintf( stdout, "UPD : %s\n", pInfo->pUpd );
 fprintf( stdout, "Minor : %s\n", pInfo->pMinor );
 fprintf( stdout, "Build : %s\n", pInfo->pBuild );
-fprintf( stdout, "Inpath : %s\n", pInfo->pInpath );
 }
 else
 fprintf( stderr, "VersionInfo not Found !\n" );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Warning and error during settingup lode in windows

[Nikhil Kumar vats]

Hi,

I have Visual Studio community 2013 update 5 and java 32 bit installed in
windows 10 machine.

After running "../../opt/bin/make 2>&1| tee build.log" command I get
following errors.

Following is output of build.log file.

Can you point me direction what I am doing wrong.


rce/filter/excel/exctools.cxx:132: XclImpOutlineBuffer::MakeScOutline:
unexpected level!
warn:legacy.osl:3264:5768:sc/source/filter/excel/exctools.cxx:132:
XclImpOutlineBuffer::MakeScOutline: unexpected level!
ScOpenCLTest::testNegSub finished in: 750ms
warn:sc:3264:5768:sc/source/filter/excel/xlroot.cxx:150:
XclRootData::XclRootData - cannot get output device info: invalid attempt
to assign an empty interface of type com.sun.star.frame.XFrame!
warn:legacy.osl:3264:5768:sc/source/filter/excel/exctools.cxx:132:
XclImpOutlineBuffer::MakeScOutline: unexpected level!
warn:legacy.osl:3264:5768:sc/source/filter/excel/exctools.cxx:132:
XclImpOutlineBuffer::MakeScOutline: unexpected level!
warn:sc:3264:5768:sc/source/filter/excel/xlroot.cxx:150:
XclRootData::XclRootData - cannot get output device info: invalid attempt
to assign an empty interface of type com.sun.star.frame.XFrame!
warn:legacy.osl:3264:5768:sc/source/filter/excel/exctools.cxx:132:
XclImpOutlineBuffer::MakeScOutline: unexpected level!
warn:legacy.osl:3264:5768:sc/source/filter/excel/exctools.cxx:132:
XclImpOutlineBuffer::MakeScOutline: unexpected level!
ScOpenCLTest::testStatisticalFormulaAvedev finished in: 625ms
warn:sc:3264:5768:sc/source/filter/excel/xlroot.cxx:150:
XclRootData::XclRootData - cannot get output device info: invalid attempt
to assign an empty interface of type com.sun.star.frame.XFrame!
warn:legacy.osl:3264:5768:sc/source/filter/excel/exctools.cxx:132:
XclImpOutlineBuffer::MakeScOutline: unexpected level!
warn:legacy.osl:3264:5768:sc/source/filter/excel/exctools.cxx:132:
XclImpOutlineBuffer::MakeScOutline: unexpected level!
warn:sc:3264:5768:sc/source/filter/excel/xlroot.cxx:150:
XclRootData::XclRootData - cannot get output device info: invalid attempt
to assign an empty interface of type com.sun.star.frame.XFrame!
warn:legacy.osl:3264:5768:sc/source/filter/excel/exctools.cxx:132:
XclImpOutlineBuffer::MakeScOutline: unexpected level!
warn:legacy.osl:3264:5768:sc/source/filter/excel/exctools.cxx:132:
XclImpOutlineBuffer::MakeScOutline: unexpected level!
ScOpenCLTest::testMathFormulaAverageIf_Mix finished in: 391ms
warn:sc:3264:5768:sc/source/filter/excel/xlroot.cxx:150:
XclRootData::XclRootData - cannot get output device info: invalid attempt
to assign an empty interface of type com.sun.star.frame.XFrame!
warn:legacy.osl:3264:5768:sc/source/filter/excel/exctools.cxx:132:
XclImpOutlineBuffer::MakeScOutline: unexpected level!
warn:legacy.osl:3264:5768:sc/source/filter/excel/exctools.cxx:132:
XclImpOutlineBuffer::MakeScOutline: unexpected level!
warn:sc:3264:5768:sc/source/filter/excel/xlroot.cxx:150:
XclRootData::XclRootData - cannot get output device info: invalid attempt
to assign an empty interface of type com.sun.star.frame.XFrame!
warn:legacy.osl:3264:5768:sc/source/filter/excel/exctools.cxx:132:
XclImpOutlineBuffer::MakeScOutline: unexpected level!
warn:legacy.osl:3264:5768:sc/source/filter/excel/exctools.cxx:132:
XclImpOutlineBuffer::MakeScOutline: unexpected level!
ScOpenCLTest::testStatisticalFormulaKurt1 finished in: 438ms
warn:sc:3264:5768:sc/source/filter/excel/xlroot.cxx:150:
XclRootData::XclRootData - cannot get output device info: invalid attempt
to assign an empty interface of type com.sun.star.frame.XFrame!
warn:legacy.osl:3264:5768:sc/source/filter/excel/exctools.cxx:132:
XclImpOutlineBuffer::MakeScOutline: unexpected level!
warn:legacy.osl:3264:5768:sc/source/filter/excel/exctools.cxx:132:
XclImpOutlineBuffer::MakeScOutline: unexpected level!
warn:sc:3264:5768:sc/source/filter/excel/xlroot.cxx:150:
XclRootData::XclRootData - cannot get output device info: invalid attempt
to assign an empty interface of type com.sun.star.frame.XFrame!
warn:legacy.osl:3264:5768:sc/source/filter/excel/exctools.cxx:132:
XclImpOutlineBuffer::MakeScOutline: unexpected level!
warn:legacy.osl:3264:5768:sc/source/filter/excel/exctools.cxx:132:
XclImpOutlineBuffer::MakeScOutline: unexpected level!
ScOpenCLTest::testStatisticalFormulaHarMean1 finished in: 406ms
warn:sc:3264:5768:sc/source/filter/excel/xlroot.cxx:150:
XclRootData::XclRootData - cannot get output device info: invalid attempt
to assign an empty interface of type com.sun.star.frame.XFrame!
warn:legacy.osl:3264:5768:sc/source/filter/excel/exctools.cxx:132:
XclImpOutlineBuffer::MakeScOutline: unexpected level!
warn:legacy.osl:3264:5768:sc/source/filter/excel/exctools.cxx:132:
XclImpOutlineBuffer::MakeScOutline: unexpected level!
warn:sc:3264:5768:sc/source/filter/excel/xlroot.cxx:150:
XclRootData::XclRootData - cannot get output device info: invalid attempt
to assign an empty interface of type com.sun.star.frame.XFrame!
warn:legacy.osl:3264:5768:sc/source/filter/excel/exctools.cxx:132:
XclImpOutlineBuffer::

Re: Warning and error during settingup lode in windows

[Kaganski Mike]

Hi!

On 12/24/2016 6:25 AM, Nikhil Kumar vats wrote:
I have Visual Studio 2013 update 5 and java 32 bit installed in windows 10 
machine.
After running "../../opt/bin/make 2>&1 | tee build.log" command I get 2 errors.
Following is output of build.log file.
Can you point me direction what I am doing wrong.

[build CUT] sc_mathematical_functions_test
[build CUT] sc_spreadsheet_functions_test
[build CUT] sc_statistical_functions_test
[build CUT] sc_text_functions_test
warn:sal.bootstrap:3632:1656:sal/rtl/bootstrap.cxx:379: couldn't open file: 
file:///C:/cygwin/home/Nikhil/lode/dev/core/workdir/LinkTarget/Executable/cppunittester.ini

warn:legacy.osl:3632:1656:sc/source/filter/excel/exctools.cxx:132: 
XclImpOutlineBuffer::MakeScOutline: unexpected level!
warn:leg



You seem to miss the error part :)
--
Best regards,
Mike Kaganski
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Warning and error during settingup lode in windows

[Nikhil Kumar vats]

Hi,

I have Visual Studio 2013 update 5 and java 32 bit installed in windows 10
machine.
After running "../../opt/bin/make 2>&1 | tee build.log" command I get 2
errors.
Following is output of build.log file.
Can you point me direction what I am doing wrong.

[build CUT] sc_mathematical_functions_test
[build CUT] sc_spreadsheet_functions_test
[build CUT] sc_statistical_functions_test
[build CUT] sc_text_functions_test
warn:sal.bootstrap:3632:1656:sal/rtl/bootstrap.cxx:379: couldn't open file:
file:///C:/cygwin/home/Nikhil/lode/dev/core/workdir/LinkTarget/Executable/cppunittester.ini
warn:sfx.control:3632:1656:sfx2/source/control/dispatch.cxx:564: Unflushed
dispatcher!
warn:sc:3632:1656:sc/source/filter/excel/xlroot.cxx:150:
XclRootData::XclRootData - cannot get output device info: invalid attempt
to assign an empty interface of type com.sun.star.frame.XFrame!
warn:legacy.osl:3632:1656:sc/source/filter/excel/exctools.cxx:132:
XclImpOutlineBuffer::MakeScOutline: unexpected level!
warn:legacy.osl:3632:1656:sc/source/filter/excel/exctools.cxx:132:
XclImpOutlineBuffer::MakeScOutline: unexpected level!
warn:sc:3632:1656:sc/source/filter/excel/xlroot.cxx:150:
XclRootData::XclRootData - cannot get output device info: invalid attempt
to assign an empty interface of type com.sun.star.frame.XFrame!
warn:legacy.osl:3632:1656:sc/source/filter/excel/exctools.cxx:132:
XclImpOutlineBuffer::MakeScOutline: unexpected level!
warn:legacy.osl:3632:1656:sc/source/filter/excel/exctools.cxx:132:
XclImpOutlineBuffer::MakeScOutline: unexpected level!
ScOpenCLTest::testSystematic finished in: 4344ms
warn:sc:3632:1656:sc/source/filter/excel/xlroot.cxx:150:
XclRootData::XclRootData - cannot get output device info: invalid attempt
to assign an empty interface of type com.sun.star.frame.XFrame!
warn:legacy.osl:3632:1656:sc/source/filter/excel/exctools.cxx:132:
XclImpOutlineBuffer::MakeScOutline: unexpected level!
warn:legacy.osl:3632:1656:sc/source/filter/excel/exctools.cxx:132:
XclImpOutlineBuffer::MakeScOutline: unexpected level!
warn:legacy.osl:3632:1656:sc/source/filter/excel/exctools.cxx:132:
XclImpOutlineBuffer::MakeScOutline: unexpected level!
warn:legacy.osl:3632:1656:sc/source/filter/excel/exctools.cxx:132:
XclImpOutlineBuffer::MakeScOutline: unexpected level!
warn:sc:3632:1656:sc/source/filter/excel/xlroot.cxx:150:
XclRootData::XclRootData - cannot get output device info: invalid attempt
to assign an empty interface of type com.sun.star.frame.XFrame!
warn:legacy.osl:3632:1656:sc/source/filter/excel/exctools.cxx:132:
XclImpOutlineBuffer::MakeScOutline: unexpected level!
warn:legacy.osl:3632:1656:sc/source/filter/excel/exctools.cxx:132:
XclImpOutlineBuffer::MakeScOutline: unexpected level!
warn:legacy.osl:3632:1656:sc/source/filter/excel/exctools.cxx:132:
XclImpOutlineBuffer::MakeScOutline: unexpected level!
warn:legacy.osl:3632:1656:sc/source/filter/excel/exctools.cxx:132:
XclImpOutlineBuffer::MakeScOutline: unexpected level!
ScOpenCLTest::testSharedFormulaXLS finished in: 734ms
warn:sc:3632:1656:sc/source/filter/excel/xlroot.cxx:150:
XclRootData::XclRootData - cannot get output device info: invalid attempt
to assign an empty interface of type com.sun.star.frame.XFrame!
warn:legacy.osl:3632:1656:sc/source/filter/excel/exctools.cxx:132:
XclImpOutlineBuffer::MakeScOutline: unexpected level!
warn:legacy.osl:3632:1656:sc/source/filter/excel/exctools.cxx:132:
XclImpOutlineBuffer::MakeScOutline: unexpected level!
warn:legacy.osl:3632:1656:sc/source/filter/excel/exctools.cxx:132:
XclImpOutlineBuffer::MakeScOutline: unexpected level!
warn:legacy.osl:3632:1656:sc/source/filter/excel/exctools.cxx:132:
XclImpOutlineBuffer::MakeScOutline: unexpected level!
warn:legacy.osl:3632:1656:sc/source/filter/excel/exctools.cxx:132:
XclImpOutlineBuffer::MakeScOutline: unexpected level!
warn:legacy.osl:3632:1656:sc/source/filter/excel/exctools.cxx:132:
XclImpOutlineBuffer::MakeScOutline: unexpected level!
warn:legacy.osl:3632:1656:sc/source/filter/excel/exctools.cxx:132:
XclImpOutlineBuffer::MakeScOutline: unexpected level!
warn:legacy.osl:3632:1656:sc/source/filter/excel/exctools.cxx:132:
XclImpOutlineBuffer::MakeScOutline: unexpected level!
warn:legacy.osl:3632:1656:sc/source/filter/excel/exctools.cxx:132:
XclImpOutlineBuffer::MakeScOutline: unexpected level!
warn:legacy.osl:3632:1656:sc/source/filter/excel/exctools.cxx:132:
XclImpOutlineBuffer::MakeScOutline: unexpected level!
warn:legacy.osl:3632:1656:sc/source/filter/excel/exctools.cxx:132:
XclImpOutlineBuffer::MakeScOutline: unexpected level!
warn:legacy.osl:3632:1656:sc/source/filter/excel/exctools.cxx:132:
XclImpOutlineBuffer::MakeScOutline: unexpected level!
warn:legacy.osl:3632:1656:sc/source/filter/excel/exctools.cxx:132:
XclImpOutlineBuffer::MakeScOutline: unexpected level!
warn:legacy.osl:3632:1656:sc/source/filter/excel/exctools.cxx:132:
XclImpOutlineBuffer::MakeScOutline: unexpected level!
warn:legacy.osl:3632:1656:sc/source/filter/excel/exctools.cxx:132:
XclImpOutlineBuffer::MakeScOutli

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

[Mark Hung]

 sw/qa/extras/odfimport/data/tdf101729.odt |binary
 sw/qa/extras/odfimport/odfimport.cxx  |   10 ++
 2 files changed, 10 insertions(+)

New commits:
commit f05714c3527635bd78bf7ded7b7a160dbe3b4685
Author: Mark Hung 
Date:   Mon Dec 12 01:12:21 2016 +0800

tdf#101729 add test case to make sure that the text is inside the cell.

Change-Id: Icffbf20f7bbca3d645a769cc294a3fd7acb51d97
Reviewed-on: https://gerrit.libreoffice.org/31870
Tested-by: Jenkins 
Reviewed-by: Mark Hung 

diff --git a/sw/qa/extras/odfimport/data/tdf101729.odt 
b/sw/qa/extras/odfimport/data/tdf101729.odt
new file mode 100755
index 000..3afd2d0
Binary files /dev/null and b/sw/qa/extras/odfimport/data/tdf101729.odt differ
diff --git a/sw/qa/extras/odfimport/odfimport.cxx 
b/sw/qa/extras/odfimport/odfimport.cxx
index 9c21cad..1500ff8 100644
--- a/sw/qa/extras/odfimport/odfimport.cxx
+++ b/sw/qa/extras/odfimport/odfimport.cxx
@@ -761,5 +761,15 @@ DECLARE_ODFIMPORT_TEST(testTdf75221, "tdf75221.odt")
 CPPUNIT_ASSERT(top.toInt32() > 0);
 }
 
+DECLARE_ODFIMPORT_TEST(testTdf101729, "tdf101729.odt")
+{
+sal_Int32 l = parseDump("/root/page/body/tab/row/cell[1]/infos/bounds", 
"left").toInt32();
+sal_Int32 w = parseDump("/root/page/body/tab/row/cell[1]/infos/bounds", 
"width").toInt32();
+sal_Int32 x = 
parseDump("/root/page/body/tab/row/cell[1]/txt/infos/bounds", "left").toInt32();
+// Make sure the text does not go outside and verify it is centered roughly
+CPPUNIT_ASSERT( l + w / 4 < x  );
+CPPUNIT_ASSERT( x < l + 3 * w / 4);
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Edmund Wong - license statement

[ew]

All of my past & future contributions to LibreOffice may be
 licensed under the MPLv2/LGPLv3+ dual license.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Tomaž Vajngerl]

 vcl/inc/implimagetree.hxx   |3 ++
 vcl/source/image/ImplImageTree.cxx  |   50 
 vcl/unx/generic/window/salframe.cxx |   11 +--
 3 files changed, 40 insertions(+), 24 deletions(-)

New commits:
commit 96b95f5010be090ebae6f755d4d3891a2334332c
Author: Tomaž Vajngerl 
Date:   Thu Dec 22 22:28:23 2016 +0100

tdf#103626 don't scale application icon to prevent a start-up loop

Change-Id: I2e65ba16d93167dc4abb029c7e941e91be9a62ab
Reviewed-on: https://gerrit.libreoffice.org/32382
Tested-by: Jenkins 
Reviewed-by: Tomaž Vajngerl 

diff --git a/vcl/inc/implimagetree.hxx b/vcl/inc/implimagetree.hxx
index 108dc97..5fa528e 100644
--- a/vcl/inc/implimagetree.hxx
+++ b/vcl/inc/implimagetree.hxx
@@ -53,6 +53,9 @@ struct ImageRequestParameters
 , mbLocalized(bLocalized)
 , meFlags(eFlags)
 {}
+
+bool convertToDarkTheme();
+sal_Int32 scalePrecentage();
 };
 
 class ImplImageTree
diff --git a/vcl/source/image/ImplImageTree.cxx 
b/vcl/source/image/ImplImageTree.cxx
index 4cd491d..42f2104 100644
--- a/vcl/source/image/ImplImageTree.cxx
+++ b/vcl/source/image/ImplImageTree.cxx
@@ -49,6 +49,25 @@
 #include 
 #include 
 
+bool ImageRequestParameters::convertToDarkTheme()
+{
+static bool bIconsForDarkTheme = !!getenv("VCL_ICONS_FOR_DARK_THEME");
+
+bool bConvertToDarkTheme = false;
+if (!(meFlags & ImageLoadFlags::IgnoreDarkTheme))
+bConvertToDarkTheme = bIconsForDarkTheme;
+
+return bConvertToDarkTheme;
+}
+
+sal_Int32 ImageRequestParameters::scalePrecentage()
+{
+sal_Int32 aScalePercentage = 100;
+if (!(meFlags & ImageLoadFlags::IgnoreScalingFactor))
+aScalePercentage = 
Application::GetDefaultDevice()->GetDPIScalePercentage();
+return aScalePercentage;
+}
+
 namespace
 {
 
@@ -134,15 +153,8 @@ std::shared_ptr wrapStream(css::uno::Reference< 
css::io::XInputStream
 
 void loadImageFromStream(std::shared_ptr const & xStream, OUString 
const & rPath, ImageRequestParameters& rParameters)
 {
-static bool bIconsForDarkTheme = !!getenv("VCL_ICONS_FOR_DARK_THEME");
-
-bool bConvertToDarkTheme = bIconsForDarkTheme;
-if (rParameters.meFlags & ImageLoadFlags::IgnoreDarkTheme)
-bConvertToDarkTheme = false;
-
-float aScaleFactor = Application::GetDefaultDevice()->GetDPIScaleFactor();
-if (rParameters.meFlags & ImageLoadFlags::IgnoreScalingFactor)
-aScaleFactor = 1.0f;
+bool bConvertToDarkTheme = rParameters.convertToDarkTheme();
+sal_Int32 aScalePercentage = rParameters.scalePrecentage();
 
 if (rPath.endsWith(".png"))
 {
@@ -152,7 +164,7 @@ void loadImageFromStream(std::shared_ptr const & 
xStream, OUString con
 }
 else if (rPath.endsWith(".svg"))
 {
-vcl::bitmap::loadFromSvg(*xStream.get(), rPath, rParameters.mrBitmap, 
double(aScaleFactor));
+vcl::bitmap::loadFromSvg(*xStream.get(), rPath, rParameters.mrBitmap, 
aScalePercentage / 100.0);
 if (bConvertToDarkTheme)
 rParameters.mrBitmap = 
BitmapProcessor::createLightImage(rParameters.mrBitmap);
 return;
@@ -165,8 +177,11 @@ void loadImageFromStream(std::shared_ptr const & 
xStream, OUString con
 if (bConvertToDarkTheme)
 rParameters.mrBitmap = 
BitmapProcessor::createLightImage(rParameters.mrBitmap);
 
-if (aScaleFactor > 1.0f)
-rParameters.mrBitmap.Scale(double(aScaleFactor), double(aScaleFactor), 
BmpScaleFlag::Fast);
+if (aScalePercentage > 100)
+{
+double aScaleFactor(aScalePercentage / 100.0);
+rParameters.mrBitmap.Scale(aScaleFactor, aScaleFactor, 
BmpScaleFlag::Fast);
+}
 }
 
 } // end anonymous namespace
@@ -283,15 +298,8 @@ bool ImplImageTree::loadDefaultImage(OUString const & 
style, BitmapEx& bitmap, c
 
 OUString createVariant(ImageRequestParameters& rParameters)
 {
-static bool bIconsForDarkTheme = !!getenv("VCL_ICONS_FOR_DARK_THEME");
-
-bool bConvertToDarkTheme = bIconsForDarkTheme;
-if (rParameters.meFlags & ImageLoadFlags::IgnoreDarkTheme)
-bConvertToDarkTheme = false;
-
-sal_Int32 aScalePercentage = 
Application::GetDefaultDevice()->GetDPIScalePercentage();
-if (rParameters.meFlags & ImageLoadFlags::IgnoreScalingFactor)
-aScalePercentage = 100;
+bool bConvertToDarkTheme = rParameters.convertToDarkTheme();
+sal_Int32 aScalePercentage = rParameters.scalePrecentage();
 
 OUString aVariant;
 if (aScalePercentage == 100 && !bConvertToDarkTheme)
diff --git a/vcl/unx/generic/window/salframe.cxx 
b/vcl/unx/generic/window/salframe.cxx
index ba4c190..ffbccc7 100644
--- a/vcl/unx/generic/window/salframe.cxx
+++ b/vcl/unx/generic/window/salframe.cxx
@@ -35,6 +35,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -209,7 +210,10 @@ static void CreateNetWmAppIcon( sal_uInt16 nIcon, 
NetWmIconData& netwm_icon )
 nIconSizeOffset = SV_ICON_SIZE32_START;
 else
 nIconSizeOffset =

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

[Caolán McNamara]

 include/vcl/toolbox.hxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 995dca083778c9bd76f34f48134bb347f99de9b2
Author: Caolán McNamara 
Date:   Fri Dec 23 20:58:17 2016 +

remove unused ImageList member

since

commit 284ca1a5840c5fcbf4f9d1eff02ae607cdc2c222
Author: Noel Grandin 
Date:   Sat May 28 14:38:03 2016 +0200

Convert RSC_TOOLBOX to scoped enum

and drop unused (in .src files) constants

Change-Id: I0e05389e1bbd5f74ff3b3cd9f1f16cfd54b992c2

diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx
index 7fe0b7a..083e6e6 100644
--- a/include/vcl/toolbox.hxx
+++ b/include/vcl/toolbox.hxx
@@ -93,7 +93,6 @@ class VCL_DLLPUBLIC ToolBox : public DockingWindow
 private:
 ImplToolBoxPrivateData*   mpData;
 std::vector maFloatSizes;
-ImageList   maImageList;
 Idle   *mpIdle;
 Rectangle   maUpperRect;
 Rectangle   maLowerRect;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 dbaccess/source/ui/imagelists/dbimagelists.src |   25 -
 dbaccess/source/ui/inc/dbu_resource.hrc|4 
 2 files changed, 29 deletions(-)

New commits:
commit f37042f0f27f9e0ac73d1ae16c8ad35d68855eb5
Author: Caolán McNamara 
Date:   Fri Dec 23 20:52:27 2016 +

remove unused ImageLists

since...

commit 0dc13e9c06bf5bc188b427f0760d0dc2eee8f75e
Author: Caolán McNamara 
Date:   Tue Jun 10 12:32:03 2014 +0100

tweak things to allow switching between small and large toolbar icons

Change-Id: I3e1821297c5f7ea1a00356e51167d75265462ee7

diff --git a/dbaccess/source/ui/imagelists/dbimagelists.src 
b/dbaccess/source/ui/imagelists/dbimagelists.src
index dff9830..bf1a812 100644
--- a/dbaccess/source/ui/imagelists/dbimagelists.src
+++ b/dbaccess/source/ui/imagelists/dbimagelists.src
@@ -20,31 +20,6 @@
 #include "dbu_dlg.hrc"
 #include "browserids.hxx"
 
-#define IL_TOOL_2 \
-\
-IdList = {\
-ID_INDEX_NEW;\
-ID_INDEX_DROP;\
-ID_INDEX_RENAME;\
-ID_INDEX_SAVE;\
-ID_INDEX_RESET;\
-};\
-IdCount = {\
-5;\
-}
-
-ImageList IMG_INDEX_DLG_SC
-{
-prefix = "sc";
-IL_TOOL_2 ;
-};
-
-ImageList IMG_INDEX_DLG_LC
-{
-prefix = "lc";
-IL_TOOL_2 ;
-};
-
 Image IMG_FORMFOLDER_TREE_L
 {
 ImageBitmap = Bitmap { File = "forms_32"; };
diff --git a/dbaccess/source/ui/inc/dbu_resource.hrc 
b/dbaccess/source/ui/inc/dbu_resource.hrc
index 386a401..8049de2 100644
--- a/dbaccess/source/ui/inc/dbu_resource.hrc
+++ b/dbaccess/source/ui/inc/dbu_resource.hrc
@@ -121,10 +121,6 @@
 // free
 #define FORMFOLDER_TREE_ICONRID_IMAGE_START + 55
 
-// image lists
-#define IMG_INDEX_DLG_SCRID_IMAGELIST_START +  1
-#define IMG_INDEX_DLG_LCRID_IMAGELIST_START +  3
-
 // menus
 
 #define RID_SBA_GRID_COLCTXMENU RID_MENU_START +  2
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 avmedia/source/framework/MediaControlBase.cxx |   46 ++---
 avmedia/source/framework/mediacontrol.cxx |4 -
 avmedia/source/framework/mediacontrol.hrc |   25 ---
 avmedia/source/framework/mediacontrol.src |   91 ++
 include/avmedia/MediaControlBase.hxx  |5 -
 5 files changed, 119 insertions(+), 52 deletions(-)

New commits:
commit 7a339a03d2dbdd84fdc2b583b2c52a7f2f477589
Author: Caolán McNamara 
Date:   Fri Dec 23 20:40:22 2016 +

unwind AVMEDIA_IMGLST/AVMEDIA_IMGLST_L ImageLists

Change-Id: Idf115c12c5da138141010673ed2bf0525aec6aaa

diff --git a/avmedia/source/framework/MediaControlBase.cxx 
b/avmedia/source/framework/MediaControlBase.cxx
index 522479d..29921e7 100644
--- a/avmedia/source/framework/MediaControlBase.cxx
+++ b/avmedia/source/framework/MediaControlBase.cxx
@@ -34,8 +34,7 @@ using ::rtl::OUString;
 
 namespace avmedia {
 
-MediaControlBase::MediaControlBase():
-maImageList( SvtMiscOptions().AreCurrentSymbolsLarge() ? AVMEDIA_RESID( 
AVMEDIA_IMGLST_L ) : AVMEDIA_RESID( AVMEDIA_IMGLST ) )
+MediaControlBase::MediaControlBase()
 {
 }
 
@@ -97,21 +96,21 @@ void MediaControlBase::UpdateTimeSlider( MediaItem 
aMediaItem )
 
 void MediaControlBase::InitializeWidgets()
 {
-mpPlayToolBox->InsertItem( AVMEDIA_TOOLBOXITEM_PLAY, GetImage( 
AVMEDIA_IMG_PLAY ), OUString( AVMEDIA_RESID( AVMEDIA_STR_PLAY ) ), 
ToolBoxItemBits::CHECKABLE );
+mpPlayToolBox->InsertItem( AVMEDIA_TOOLBOXITEM_PLAY, 
GetImage(AVMEDIA_TOOLBOXITEM_PLAY), OUString( AVMEDIA_RESID( AVMEDIA_STR_PLAY ) 
), ToolBoxItemBits::CHECKABLE );
 mpPlayToolBox->SetHelpId( AVMEDIA_TOOLBOXITEM_PLAY, 
HID_AVMEDIA_TOOLBOXITEM_PLAY );
 
-mpPlayToolBox->InsertItem( AVMEDIA_TOOLBOXITEM_PAUSE, GetImage( 
AVMEDIA_IMG_PAUSE ), OUString( AVMEDIA_RESID( AVMEDIA_STR_PAUSE ) ), 
ToolBoxItemBits::CHECKABLE );
+mpPlayToolBox->InsertItem( AVMEDIA_TOOLBOXITEM_PAUSE, 
GetImage(AVMEDIA_TOOLBOXITEM_PAUSE), OUString( AVMEDIA_RESID( AVMEDIA_STR_PAUSE 
) ), ToolBoxItemBits::CHECKABLE );
 mpPlayToolBox->SetHelpId( AVMEDIA_TOOLBOXITEM_PAUSE, 
HID_AVMEDIA_TOOLBOXITEM_PAUSE );
 
-mpPlayToolBox->InsertItem( AVMEDIA_TOOLBOXITEM_STOP, GetImage( 
AVMEDIA_IMG_STOP ), OUString( AVMEDIA_RESID( AVMEDIA_STR_STOP ) ), 
ToolBoxItemBits::CHECKABLE );
+mpPlayToolBox->InsertItem( AVMEDIA_TOOLBOXITEM_STOP, 
GetImage(AVMEDIA_TOOLBOXITEM_STOP), OUString( AVMEDIA_RESID( AVMEDIA_STR_STOP ) 
), ToolBoxItemBits::CHECKABLE );
 mpPlayToolBox->SetHelpId( AVMEDIA_TOOLBOXITEM_STOP, 
HID_AVMEDIA_TOOLBOXITEM_STOP );
 
 mpPlayToolBox->InsertSeparator();
 
-mpPlayToolBox->InsertItem( AVMEDIA_TOOLBOXITEM_LOOP, GetImage( 
AVMEDIA_IMG_ENDLESS ), OUString( AVMEDIA_RESID( AVMEDIA_STR_ENDLESS ) ) );
+mpPlayToolBox->InsertItem( AVMEDIA_TOOLBOXITEM_LOOP, 
GetImage(AVMEDIA_TOOLBOXITEM_LOOP), OUString( AVMEDIA_RESID( AVMEDIA_STR_LOOP ) 
) );
 mpPlayToolBox->SetHelpId( AVMEDIA_TOOLBOXITEM_LOOP, 
HID_AVMEDIA_TOOLBOXITEM_LOOP );
 
-mpMuteToolBox->InsertItem( AVMEDIA_TOOLBOXITEM_MUTE, GetImage( 
AVMEDIA_IMG_MUTE ), OUString( AVMEDIA_RESID( AVMEDIA_STR_MUTE ) ) );
+mpMuteToolBox->InsertItem( AVMEDIA_TOOLBOXITEM_MUTE, 
GetImage(AVMEDIA_TOOLBOXITEM_MUTE), OUString( AVMEDIA_RESID( AVMEDIA_STR_MUTE ) 
) );
 mpMuteToolBox->SetHelpId( AVMEDIA_TOOLBOXITEM_MUTE, 
HID_AVMEDIA_TOOLBOXITEM_MUTE );
 
 mpZoomListBox->InsertEntry( OUString( AVMEDIA_RESID( AVMEDIA_STR_ZOOM_50 ) 
), AVMEDIA_ZOOMLEVEL_50 );
@@ -265,9 +264,38 @@ void MediaControlBase::SelectPlayToolBoxItem( MediaItem& 
aExecItem, MediaItem aI
 }
 }
 
-Image MediaControlBase::GetImage( sal_Int32 nImageId) const
+Image MediaControlBase::GetImage(sal_Int32 nImageId)
 {
-return maImageList.GetImage( static_cast< sal_uInt16 >( nImageId ) );
+const bool bLarge = SvtMiscOptions().AreCurrentSymbolsLarge();
+
+switch (nImageId)
+{
+default:
+case AVMEDIA_TOOLBOXITEM_PLAY:
+nImageId = bLarge ? AVMEDIA_IMG_PLAY_LARGE : 
AVMEDIA_IMG_PLAY_NORMAL;
+break;
+case AVMEDIA_TOOLBOXITEM_PAUSE:
+nImageId = bLarge ? AVMEDIA_IMG_PAUSE_LARGE : 
AVMEDIA_IMG_PAUSE_NORMAL;
+break;
+case AVMEDIA_TOOLBOXITEM_STOP:
+nImageId = bLarge ? AVMEDIA_IMG_STOP_LARGE : 
AVMEDIA_IMG_STOP_NORMAL;
+break;
+case AVMEDIA_TOOLBOXITEM_MUTE:
+nImageId = bLarge ? AVMEDIA_IMG_MUTE_LARGE : 
AVMEDIA_IMG_MUTE_NORMAL;
+break;
+case AVMEDIA_TOOLBOXITEM_LOOP:
+nImageId = bLarge ? AVMEDIA_IMG_LOOP_LARGE : 
AVMEDIA_IMG_LOOP_NORMAL;
+break;
+case AVMEDIA_TOOLBOXITEM_OPEN:
+nImageId = bLarge ? AVMEDIA_IMG_OPEN_LARGE : 
AVMEDIA_IMG_OPEN_NORMAL;
+break;
+case AVMEDIA_TOOLBOXITEM_INSERT:
+nImageId = bLarge ? AVMEDIA_IMG_INSERT_LARGE : 
AVMEDIA_IMG_INSERT_NORMAL;
+break;
+
+}
+
+return Image(BitmapEx(AVMEDIA_RESID(nImageId)));
 

[Libreoffice-commits] help.git: Changes to 'refs/tags/libreoffice-5.3.0.1'

[Christian Lohmaier]

Tag 'libreoffice-5.3.0.1' created by Christian Lohmaier 
 at 2016-12-23 20:08 +

Tag libreoffice-5.3.0.1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAABAgAGBQJYXYQuAAoJEPQ0oe+v7q6jGiMP/jETMIKMP5EOTREzxkx+dAKW
6pGt7B3cbHrHQftLQshxIJR+Fdmccb1MzCaPcwcIWrxRB3kl4eA5b3zs5zriunVr
KuO6K9K+OIxbK8923sFtsweIqngy5o7GbHp+5wIwXeM4Z50axBZxF9J8Th6JMDq2
9DZW7Sy7inJUkgsm8Kxaf0qTKCu6maOvq+9gpN1aKV71WTAAIy6BAYoxAaXrrwhR
e/sfMVrMU8LVUN9fiH2IAbE/meDobRx2jsbduHdCbyuiyv+5JFsCVcR7aHfxIcZu
cwXB6Dt+YLE+VClNy2o6ZkRgIl2uS5xvDQT5TtiVSo9vg/pJbMJzUIaaM6Ehozxf
sHcdi7yXvxqeue7rusALXhxGr3yHr6YN1B3ycyEAARDiCCZ0kE3xq5dr3wgo5zdr
1k+/c+8ABDVqxoyIsCRusqitGEGoXtblPcrJZprJdkqCZE5GDYkAa7pYO0BhFmgQ
Wopaj7IatASTroyXcG4AUS2Pz8DnFRpo62WnOIm0nbWz7Ml2SwC3jG4hfkAoaGWw
uiWPeZUScKSOV4emElL14Nd1jtpmkeGRIcklI034gPAk7opnEgQzc+wvfbFKo8oy
8mRT4C+lpfw+PwTqFp9/ghQjqDeqfkxc71AoDo0SGTBCni6CCMbTIH2P6KJXxfF3
fNq64DR2QzWPSoaN+kKA
=CGx9
-END PGP SIGNATURE-

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

[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/libreoffice-5.3.0.1'

[Christian Lohmaier]

Tag 'libreoffice-5.3.0.1' created by Christian Lohmaier 
 at 2016-12-23 20:08 +

Tag libreoffice-5.3.0.1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAABAgAGBQJYXYQqAAoJEPQ0oe+v7q6jgikQAM09L1xPuVgRNLUekYgRk/Qa
1uEoCkoBrI2ZcuJTO9o47PyxBr50AbeESYQLD3Y8lgk2wtvlKEAczhaEUNgQ+58q
y/WfyfSYVvl6w3hWDLSK/8YL1lZ0D4i0dAZoZTwkA0yyWDe7Hxoxl9shMR1AzHIk
iB0LYce8Sg92UYamWKIE8xBTE1hlYVLZGumaRif5BlxiEqD2kgOhP5HE4zy52Y27
GLVWoFqB1itw+zKQx2bG87FnD7l3n8rFIIYBST3EskVGe2SwQUtOPAIqIIbTfHi7
7QVDKGn84NuJnGDz620aE93yFy/sEuG2nXkk56CK6kEuP4E86B/dpWJS9cqnMtT2
pBbkYIs3KGlQfWUNpM3TbdHtHjTuomRzEPHS7cj5XzEsFbKnTTdYTp9+sYL2PJFU
BMeh8V6bq9vnfEFeie3m7kNRhktB3Z65m1Gqtx9QAvNhEx2XBLB7vm/OQVPfJQv5
k21Kb1jWkRiH0/BtNQPXZZdi7QVBnyutVrXEuZJICzn84by6YT0LePMZc7dpPDUN
mpKeFUptyWRKFPPPKihaafwcr9yJhF3UMeYnpugyDtn7/IRJ9pB4WZ4qHj1nRIb7
+9YmtGSFse0DMZRlMgNpr4jQgHai0WKD8uUMhw+F8BhFudR1UREIzXPBG269UcYh
Op87uv24bx+9DrgChd3v
=UHDW
-END PGP SIGNATURE-

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

[Libreoffice-commits] translations.git: Changes to 'refs/tags/libreoffice-5.3.0.1'

[Christian Lohmaier]

Tag 'libreoffice-5.3.0.1' created by Christian Lohmaier 
 at 2016-12-23 20:08 +

Tag libreoffice-5.3.0.1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAABAgAGBQJYXYQxAAoJEPQ0oe+v7q6jKmIQALVweKi/Be/chmrI37GQEyI1
Huyobih9SfDi/ZwY8WcdUnEtFBhlIRHAzFCJZeuOeHP2TzIciHU8tulAMHZ4qMzp
RH51Lfio+5yJi5DcxG4V8gQCBGZLVh2SlWOuq2C6zZUB8zfqljM8+dCfKqE7eWnZ
9YBSULipuVgNttPL4yjhf/tsHMKO1mqD9/5ZpwMh30IutKOafPIMrl87oDlQkT9k
WAYrDm4qaQmt+6ayrmeG7iMRC/zhtIMAKGcvUP4NVxJPVh8DI5JDzlV3/ytcuGhP
nTS5QoSm5HeTRJnb7x6lQTYKVXMijQrfGOayS8O0g6CZdADGlCxzzvI9M+g47Jl+
Z0E4rMxBXhkF2KYOiQNS/pbwl0Le843SKFFRz7WSGLxmkdBQWpHccW8wOx14PA4H
xPebs4brg4MoMV23PCiDBqJ28QvhTY4ysGgOE2uRc9nEFeowBIyuRUl+3T1AnZMC
vMvWnE431QyIydWCeJn6OvxxsDKCtxxEIZkE+YpfXLnnTeZW2WtqdCUeyyojwYLC
zWek/Fs4P0rdYsfHxENK6oIjaS1S5vAm1ft+2ZaJAKtNwfhoknluEMmT333dWZ5T
88NqJCL56DRkgrEz7V7byGPKPRf1ZjcphJ6CgSuMbdxxsG9/73DbNQqnVXnTFVyJ
4uKgNljyXTCRr4dWcTsQ
=DhRk
-END PGP SIGNATURE-

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

[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - configure.ac

[Christian Lohmaier]

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7ba7a743cff5df27bfabebcf55523f5390d00698
Author: Christian Lohmaier 
Date:   Fri Dec 23 21:10:39 2016 +0100

bump product version to 5.3.0.1.0+

Change-Id: I652ed0ac712b0be456ea1ba25bead167b11056b8

diff --git a/configure.ac b/configure.ac
index 079e856..e7b1495 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[5.3.0.0.beta2+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[5.3.0.1.0+],[],[],[http://documentfoundation.org/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'refs/tags/libreoffice-5.3.0.1'

[Christian Lohmaier]

Tag 'libreoffice-5.3.0.1' created by Christian Lohmaier 
 at 2016-12-23 20:08 +

Tag libreoffice-5.3.0.1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAABAgAGBQJYXYQ0AAoJEPQ0oe+v7q6jEfQP/2FQmiJqIWiQnnj4JoMlgaBB
CbdCLq+Ogju/Jsys4YPmwPsVhELKYIhxXxqWcLwdl44F2Dd0RqkbAdjdYQnGPi+z
3BprCpuVUX/gPTIrSHi7sCcrteLXIWkdCwChJDqw4oM8cOkWWRmGX1eqWBELZWVb
mU/TsNADR/CreIMyjV39oictqP0244yE1SKsQ5bKo0suNTQO46reTkTe5i6uxF/M
zcFmLaiGILytyyFd44ol1c6DqzLhakZuBEGy7FR/tUXSzyhlSfEjHls07cZ1ePf5
B0mMIWje23sChOBUA4jUIe85kFnNh70XyQ9ZHZ0euqJrnw5DPWRdSeeqWx4d896s
RKok18a366c/z7wMMfLmVqmmk53zA1pLwzYnwzNTGlKA6byHuc3xQGh2TT+OKZW6
YBlsNpb95WjDoMaN0Qrnjdn/sxmbsx6EkFNxdHgsdiBEKxM1m+n4ilbEfE6zV70m
mq9vkfFetWw8mIvZxd3Q2vOvVMMnln1khWn+a3bnYtXGN5+21kVANDjcOopMfcYZ
QZauICFD8k64SDldtaZAc72jtJ/zFIs6N8aPIB8UAG+CRQmk1taj1FXXkBFbVuHv
BpHHr5rpmMkV5RVkKtBZmGuJKfBrFq/OUrVzayIYf0QFZkC6ClBN/3QgMup6Yce9
UeLDhWwdvRv9QmZ9ORK9
=HBGl
-END PGP SIGNATURE-

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

[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - translations

[Christian Lohmaier]

 translations |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e6e0b7a67bca7545ccce947277b262bad6a635f6
Author: Christian Lohmaier 
Date:   Fri Dec 23 20:43:41 2016 +0100

Updated core
Project: translations  49beaeb5bc72a9a5e2102cceaff12e2140073434

update translations for 5.3.0 rc1

and force-fix errors using pocheck

Change-Id: I576a654d96527a246b6a334a33f3a2e2f1adcc2e

diff --git a/translations b/translations
index c950e18..49beaeb 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit c950e18b339a369fa805ac4d34b2ae0f1e0fd82f
+Subproject commit 49beaeb5bc72a9a5e2102cceaff12e2140073434
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/headless

[Caolán McNamara]

 vcl/headless/svpbmp.cxx |8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 3cbe00474c373f21b5793915c4919e5c277d2c01
Author: Caolán McNamara 
Date:   Fri Dec 23 18:44:47 2016 +

Related: ofz#318 limit bitmap max to SAL_MAX_INT32

Change-Id: Iae8a0782e5c306f619e0d94a60dfa0d7c00ec54e

diff --git a/vcl/headless/svpbmp.cxx b/vcl/headless/svpbmp.cxx
index 10a4596..e7d367a 100644
--- a/vcl/headless/svpbmp.cxx
+++ b/vcl/headless/svpbmp.cxx
@@ -121,9 +121,15 @@ BitmapBuffer* ImplCreateDIB(
 pDIB->maPalette.SetEntryCount( nColors );
 }
 
+size_t size = pDIB->mnScanlineSize * pDIB->mnHeight;
+if (size > SAL_MAX_INT32)
+{
+delete pDIB;
+return nullptr;
+}
+
 try
 {
-size_t size = pDIB->mnScanlineSize * pDIB->mnHeight;
 pDIB->mpBits = new sal_uInt8[size];
 #ifdef __SANITIZE_ADDRESS__
 if (!pDIB->mpBits)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Krunoslav Šebetić]

 extras/source/autocorr/lang/hr/DocumentList.xml  |  699 
--
 extras/source/autocorr/lang/hr/README.md |  104 -
 extras/source/autocorr/lang/hr/SentenceExceptList.xml|  170 +-
 extras/source/autocorr/lang/hr/WordExceptList.xml|   33 
 extras/source/autocorr/lang/hr/dodano-na-documentlist.txt|2 
 extras/source/autocorr/lang/hr/licence_and_version.md|2 
 extras/source/autocorr/lang/hr/umetanje-automatskih-ispravaka.md |6 
 7 files changed, 539 insertions(+), 477 deletions(-)

New commits:
commit 036c1f445a307b464f743b35cda19827ea16d6f8
Author: Krunoslav Šebetić 
Date:   Tue Dec 6 23:01:02 2016 +0100

Update of autocorrection rules, especially WordExceptList.xml

Change-Id: Ib82b63acca23bec06ea4d8b11ec2ae49a985d745
Reviewed-on: https://gerrit.libreoffice.org/31707
Tested-by: Jenkins 
Reviewed-by: Kruno 
Reviewed-by: jan iversen 
Tested-by: jan iversen 

diff --git a/extras/source/autocorr/lang/hr/DocumentList.xml 
b/extras/source/autocorr/lang/hr/DocumentList.xml
index 279a56c..ceea635 100644
--- a/extras/source/autocorr/lang/hr/DocumentList.xml
+++ b/extras/source/autocorr/lang/hr/DocumentList.xml
@@ -1,126 +1,209 @@
-
+
 http://openoffice.org/2001/block-list";>
+
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
   
   
   
   
   
-  
-  
-  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
   
-  
-  
-  
-  
-  
-  
-  
-  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
   
+  
   
   
   
-  
-  
-  
+  
+  
+  
+  
   
   
-  
-  
-  
-  
-  
   
   
   
-  
-  
-  
   
-  
-  
-  
   
   
-  
-  
-  
   
-  
-  
-  
   
   
-  
-  
-  
   
-  
-  
-  
   
-  
-  
-  
   
-  
-  
-  
   
   
   
-  
   
   
   
   
   
-  
   
+  
   
   
   
+  
   
   
-  
-  
   
+  
   
   
   
   
-  
   
   
+  
   
   
   
   
   
   
-  
-  
-  
   
+  
   
   
   
   
-  
-  
   
   
   
-  
   
   
   
   
   
+  
   
-  
   
+  
   
   
   
@@ -133,38 +216,14 @@
   
   
   
-  
   
+  
   
   
   
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
   
-  
   
+  
   
   
   
@@ -182,27 +241,17 @@
   
   
   
-  
-  
   
-  
   
-  
-  
-  
   
   
-  
-  
   
   
   
+  
   
   
-  
   
-  
-  
   
   
   
@@ -213,25 +262,31 @@
   
   
   
-  
   
   
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
   
   
   
-  
-  
   
   
-  
   
   
   
+  
   
   
-  
-  
   
+  
   
   
   
@@ -241,8 +296,8 @@
   
   
   
-  
   
+  
   
   
   
@@ -250,34 +305,26 @@
   
   
   
-  
   
+  
   
   
   
-  
-  
-  
+  
   
   
-  
-  
   
   
   
   
-  
   
+  
   
   
-  
   
   
   
   
-  
-  
-  
   
   
   
@@ -288,174 +335,153 @@
   
   
   
-  
   
-  
-  
+  
   
   
-  
-  
   
   
   
-  
   
+  
   
   
-  
+  
   
   
   
-  
+  
   
   
-  
   
+  
   
   
+  
   
   
-  
+  
   
   
-  
-  
   
+  
   
   
   
-  
-  
   
   
   
-  
-  
-  
-  
   
+  
   
-  
-  
-  
   
   
+  
   
   
   
-  
   
+  
   
-  
-  
-  
-  
-  
   
+  
+  
   
   
   
   
   
   
+  
   
   
   
   
-  
   
   
   
   
   
   
-  
   
+  
   
   
   
+  
   
   
-  
   
+  
   
   
-  
   
+  
   
   
   
   
-  
-  
-  
-  
   
   
   
   
+  
   
   
   
-  
-  
   
-  
+  
   
   
   
-  
   
+  
   
   
   
-  
   
+  
   
-  
   
+  
   
   
   
   
-  
   
+  
   
   
   
   
-  
-  
-  
   
   
   
   
   
-  
   
+  
+  
   
   
-  
-  
   
+  
   
   
   
   
   
-  
   
+  
   
   
+  
   
   
   
   
   
   
-  
   
   
   
@@ -464,9 +490,9 @@
   
   
   
-  
-  
   
+  
+  
   
   
   
@@ -474,16 +500,16 @@
   
   
   
-  
   
+  
   
   
   
   
   
   
-  
   
+  
   
   
   
@@ -491,22 +517,22 @@
   
   
   
-  
   
+  
+  
   
   
-  
   
   
   
   
-  
   
+  
+  
   
   
-  
-  
   
+  
   
   
   
@@ -514,77 +540,69 @@
   
   
   
-  
-  
-  
   
   
+  
   
   
-  
   
   
+  
   
   
-  
   
-  
-  
-  
-  
-  
+  
   
   
-  
   
   
   
-  
-  
   
   
   
   
+  
+  
+  
+  
+  
   
-  
-  
   
   
   
   
-  
   
-  
+  
+  
+  
   
+  
   
   
-  
   
-  
+  
   
-  
+  
   
+  
   
-  
   
+  
   
   
   
-  
   
-  
+  
   
+  
   
   
   
-  
-  
-  
   
   
   
-  
   
+  
   
   
   
@@ -596,14 +614,14 @@
   
   
   
-  
   
+  
   
   
-  
-  
-  
   
+  
+  
+  
   
   
   
@@ -623,24 +641,20 @@
   
   
   
-  
-  
-  
   
-  
   
   
   
   
-  
   
-  
   
+  
+  
+  
   
   
   
   
-  
   
   
   
@@ -649,60 +663,58 @@
   
   
   
-  
-  
+  
   
+  
   
   
   
-  
   
-  
+  
   
+  
   
-  
   
+  
   
   
+  
   
+  
   
   
-  
   
-  
-  
-  
   
   
 

[Libreoffice-commits] core.git: include/svx officecfg/registry svx/sdi sw/sdi sw/source sw/uiconfig

[giacco]

 include/svx/svxids.hrc  |2 
 officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu |8 ++
 svx/sdi/svx.sdi |   15 
+
 sw/sdi/_grfsh.sdi   |7 ++
 sw/source/uibase/shells/grfsh.cxx   |   29 
--
 sw/uiconfig/sglobal/menubar/menubar.xml |1 
 sw/uiconfig/sglobal/popupmenu/graphic.xml   |1 
 sw/uiconfig/sglobal/toolbar/graphicobjectbar.xml|1 
 sw/uiconfig/sweb/menubar/menubar.xml|1 
 sw/uiconfig/sweb/popupmenu/graphic.xml  |1 
 sw/uiconfig/swform/menubar/menubar.xml  |1 
 sw/uiconfig/swform/popupmenu/graphic.xml|1 
 sw/uiconfig/swform/toolbar/graphicobjectbar.xml |1 
 sw/uiconfig/swreport/menubar/menubar.xml|1 
 sw/uiconfig/swreport/popupmenu/graphic.xml  |1 
 sw/uiconfig/swreport/toolbar/graphicobjectbar.xml   |1 
 sw/uiconfig/swriter/menubar/menubar.xml |1 
 sw/uiconfig/swriter/popupmenu/graphic.xml   |1 
 sw/uiconfig/swriter/toolbar/graphicobjectbar.xml|1 
 sw/uiconfig/swriter/ui/notebookbar.ui   |   26 

 sw/uiconfig/swxform/menubar/menubar.xml |1 
 sw/uiconfig/swxform/popupmenu/graphic.xml   |1 
 sw/uiconfig/swxform/toolbar/graphicobjectbar.xml|1 
 23 files changed, 101 insertions(+), 3 deletions(-)

New commits:
commit 5f116966de4c0d007c2a420b7adc74d72e728b89
Author: giacco 
Date:   Thu Oct 20 10:03:44 2016 +0200

tdf#87700 command to rotate 180 degrees

added command to rotate an image 180 degrees in Writer

Change-Id: I4a1e40f4c3475aceb24edd44691a74372f61b49a
Reviewed-on: https://gerrit.libreoffice.org/30074
Reviewed-by: Jan Holesovsky 
Reviewed-by: Heiko Tietze 
Reviewed-by: jan iversen 
Tested-by: jan iversen 

diff --git a/include/svx/svxids.hrc b/include/svx/svxids.hrc
index 6f6aaa5..ead4ae0 100644
--- a/include/svx/svxids.hrc
+++ b/include/svx/svxids.hrc
@@ -947,6 +947,8 @@
 #define SID_ATTR_SPECIALCHAR( SID_SVX_START + 1120 
)
 #define SID_ROTATE_GRAPHIC_LEFT ( SID_SVX_START + 1121 
)
 #define SID_ROTATE_GRAPHIC_RIGHT( SID_SVX_START + 1122 
)
+#define SID_ROTATE_GRAPHIC_180  ( SID_SVX_START + 1123 
)
+
 
 // new slots for panels
 #define SID_ATTR_FILL_TRANSPARENCE  ( SID_SVX_START + 1124 
)
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index 177ab9b..703b048 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -980,6 +980,14 @@
   1
 
   
+  
+
+  Rotate 1~80°
+
+
+  1
+
+  
   
 
   Create ~HTML Document
diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi
index 99a8bc0..2029d78 100644
--- a/svx/sdi/svx.sdi
+++ b/svx/sdi/svx.sdi
@@ -4395,7 +4395,22 @@ SfxVoidItem RotateLeft SID_ROTATE_GRAPHIC_LEFT
 ToolBoxConfig = TRUE,
 GroupId = GID_GRAPHIC;
 ]
+SfxVoidItem Rotate180 SID_ROTATE_GRAPHIC_180
 
+[
+AutoUpdate = FALSE,
+FastCall = FALSE,
+ReadOnlyDoc = TRUE,
+Toggle = FALSE,
+Container = FALSE,
+RecordAbsolute = FALSE,
+RecordPerSet;
+
+AccelConfig = TRUE,
+MenuConfig = TRUE,
+ToolBoxConfig = TRUE,
+GroupId = GID_GRAPHIC;
+]
 SfxVoidItem RotateRight SID_ROTATE_GRAPHIC_RIGHT
 
 [
diff --git a/sw/sdi/_grfsh.sdi b/sw/sdi/_grfsh.sdi
index bf8270c..be017d1 100644
--- a/sw/sdi/_grfsh.sdi
+++ b/sw/sdi/_grfsh.sdi
@@ -80,6 +80,13 @@ interface BaseTextGraphic
 DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
 ]
 
+SID_ROTATE_GRAPHIC_180
+[
+ExecMethod = ExecuteRotation ;
+StateMethod = GetAttrStateForRotation ;
+DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
+]
+
 SID_ROTATE_GRAPHIC_RIGHT
 [
 ExecMethod = ExecuteRotation ;
diff --git a/sw/source/uibase/shells/grfsh.cxx 
b/sw/source/uibase/shells/grfsh.cxx
index 73064df..953fd25 100644
--- a/sw/source/uibase/shells/grfsh.cxx
+++ b/sw/source/uibase/shells/grfsh.cxx
@@ -849,6 +849,10 @@ void SwGrfShell::ExecuteRotation(SfxRequest &rReq)
 {
 aRotation = 2700;
 }
+else if (rReq.GetSlot() == SID_ROTATE_GRAPHIC_180)
+{
+aRotation = 1800;
+}

[Libreoffice-commits] core.git: comphelper/source cui/uiconfig svtools/source svx/source

[Huzaifa Iftikhar]

 comphelper/source/container/embeddedobjectcontainer.cxx |2 +-
 cui/uiconfig/ui/screenshotannotationdialog.ui   |2 +-
 svtools/source/misc/svtools.src |4 ++--
 svx/source/gallery2/galtheme.src|2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 5c983bc2ab020b0dbbd8f58e66b9a6fd8508bfde
Author: Huzaifa Iftikhar 
Date:   Fri Dec 23 01:14:10 2016 +0530

tdf#70998 Change word "Graphic(s)" to "Image(s)"

There was an error in the previous patch inside the file 
embeddedobjectcontainer.cxx
This is fixed in this patch.

Change-Id: I01c9e254e58e1683a8e6e9a0bcff3c4663bf32e0
Reviewed-on: https://gerrit.libreoffice.org/32353
Tested-by: Jenkins 
Reviewed-by: jan iversen 

diff --git a/comphelper/source/container/embeddedobjectcontainer.cxx 
b/comphelper/source/container/embeddedobjectcontainer.cxx
index 1914773..f0e5709 100644
--- a/comphelper/source/container/embeddedobjectcontainer.cxx
+++ b/comphelper/source/container/embeddedobjectcontainer.cxx
@@ -1244,7 +1244,7 @@ namespace {
 }
 catch (const uno::Exception&)
 {
-SAL_WARN( "comphelper.container", "The pictures storage is not 
available!\n" );
+SAL_WARN( "comphelper.container", "The images storage is not 
available!\n" );
 }
 }
 
diff --git a/cui/uiconfig/ui/screenshotannotationdialog.ui 
b/cui/uiconfig/ui/screenshotannotationdialog.ui
index e5de9be..0da255e 100644
--- a/cui/uiconfig/ui/screenshotannotationdialog.ui
+++ b/cui/uiconfig/ui/screenshotannotationdialog.ui
@@ -74,7 +74,7 @@
 
 
   
-picture
+image
 True
 False
 gtk-missing-image
diff --git a/svtools/source/misc/svtools.src b/svtools/source/misc/svtools.src
index 00e70803..ff49b29 100644
--- a/svtools/source/misc/svtools.src
+++ b/svtools/source/misc/svtools.src
@@ -39,11 +39,11 @@ String STR_SVT_24BIT_TRUE_COLOR
 };
 String STR_SVT_ESTIMATED_SIZE_PIX_1
 {
-Text [ en-US ] = "The picture needs about %1 KB of memory.";
+Text [ en-US ] = "The image needs about %1 KB of memory.";
 };
 String STR_SVT_ESTIMATED_SIZE_PIX_2
 {
-Text [ en-US ] = "The picture needs about %1 KB of memory, the file size 
is %2 KB.";
+Text [ en-US ] = "The image needs about %1 KB of memory, the file size is 
%2 KB.";
 };
 String STR_SVT_ESTIMATED_SIZE_VEC
 {
diff --git a/svx/source/gallery2/galtheme.src b/svx/source/gallery2/galtheme.src
index df64246..7cc69da 100644
--- a/svx/source/gallery2/galtheme.src
+++ b/svx/source/gallery2/galtheme.src
@@ -56,7 +56,7 @@ String RID_GALLERYSTR_THEME_EMOTICONS
 
 String RID_GALLERYSTR_THEME_PHOTOS
 {
-Text [ en-US ] = "Pictures";
+Text [ en-US ] = "Images";
 };
 
 String RID_GALLERYSTR_THEME_BACKGROUNDS
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/headless

[Caolán McNamara]

 vcl/headless/svpbmp.cxx |  154 +++-
 1 file changed, 76 insertions(+), 78 deletions(-)

New commits:
commit 218179ddbffbc4d4a1e96dfaeebca19cffda5f9c
Author: Caolán McNamara 
Date:   Fri Dec 23 17:53:50 2016 +

unroll code for early returns, no logic changed intended

Change-Id: Ic1cc63a5fe3ad2c949f91c395c00f5f99bd7602a

diff --git a/vcl/headless/svpbmp.cxx b/vcl/headless/svpbmp.cxx
index 202d63c..10a4596 100644
--- a/vcl/headless/svpbmp.cxx
+++ b/vcl/headless/svpbmp.cxx
@@ -53,97 +53,95 @@ BitmapBuffer* ImplCreateDIB(
 || nBitCount == 32)
 && "Unsupported BitCount!");
 
+if (!rSize.Width() || !rSize.Height())
+return nullptr;
+
 BitmapBuffer* pDIB = nullptr;
 
-if( rSize.Width() && rSize.Height() )
+try
 {
-try
-{
-pDIB = new BitmapBuffer;
-}
-catch (const std::bad_alloc&)
-{
-pDIB = nullptr;
-}
+pDIB = new BitmapBuffer;
+}
+catch (const std::bad_alloc&)
+{
+pDIB = nullptr;
+}
 
-if( pDIB )
+if(!pDIB)
+return nullptr;
+
+const sal_uInt16 nColors = ( nBitCount <= 8 ) ? ( 1 << nBitCount ) : 0;
+
+switch (nBitCount)
+{
+case 1:
+pDIB->mnFormat = ScanlineFormat::N1BitLsbPal;
+break;
+case 4:
+pDIB->mnFormat = ScanlineFormat::N4BitMsnPal;
+break;
+case 8:
+pDIB->mnFormat = ScanlineFormat::N8BitPal;
+break;
+case 16:
 {
-const sal_uInt16 nColors = ( nBitCount <= 8 ) ? ( 1 << nBitCount ) 
: 0;
-
-switch (nBitCount)
-{
-case 1:
-pDIB->mnFormat = ScanlineFormat::N1BitLsbPal;
-break;
-case 4:
-pDIB->mnFormat = ScanlineFormat::N4BitMsnPal;
-break;
-case 8:
-pDIB->mnFormat = ScanlineFormat::N8BitPal;
-break;
-case 16:
-{
 #ifdef OSL_BIGENDIAN
-pDIB->mnFormat= ScanlineFormat::N16BitTcMsbMask;
+pDIB->mnFormat= ScanlineFormat::N16BitTcMsbMask;
 #else
-pDIB->mnFormat= ScanlineFormat::N16BitTcLsbMask;
+pDIB->mnFormat= ScanlineFormat::N16BitTcLsbMask;
 #endif
-ColorMaskElement aRedMask(0xf800);
-aRedMask.CalcMaskShift();
-ColorMaskElement aGreenMask(0x07e0);
-aGreenMask.CalcMaskShift();
-ColorMaskElement aBlueMask(0x001f);
-aBlueMask.CalcMaskShift();
-pDIB->maColorMask = ColorMask(aRedMask, aGreenMask, 
aBlueMask);
-break;
-}
-default:
-nBitCount = 32;
-SAL_FALLTHROUGH;
-case 32:
-{
-pDIB->mnFormat = SVP_CAIRO_FORMAT;
-break;
-}
-}
-
-pDIB->mnFormat |= ScanlineFormat::TopDown;
-pDIB->mnWidth = rSize.Width();
-pDIB->mnHeight = rSize.Height();
-pDIB->mnScanlineSize = AlignedWidth4Bytes( pDIB->mnWidth * 
nBitCount );
-pDIB->mnBitCount = nBitCount;
-
-if( nColors )
-{
-pDIB->maPalette = rPal;
-pDIB->maPalette.SetEntryCount( nColors );
-}
-
-try
-{
-size_t size = pDIB->mnScanlineSize * pDIB->mnHeight;
-pDIB->mpBits = new sal_uInt8[size];
+ColorMaskElement aRedMask(0xf800);
+aRedMask.CalcMaskShift();
+ColorMaskElement aGreenMask(0x07e0);
+aGreenMask.CalcMaskShift();
+ColorMaskElement aBlueMask(0x001f);
+aBlueMask.CalcMaskShift();
+pDIB->maColorMask = ColorMask(aRedMask, aGreenMask, aBlueMask);
+break;
+}
+default:
+nBitCount = 32;
+SAL_FALLTHROUGH;
+case 32:
+{
+pDIB->mnFormat = SVP_CAIRO_FORMAT;
+break;
+}
+}
+
+pDIB->mnFormat |= ScanlineFormat::TopDown;
+pDIB->mnWidth = rSize.Width();
+pDIB->mnHeight = rSize.Height();
+pDIB->mnScanlineSize = AlignedWidth4Bytes( pDIB->mnWidth * nBitCount );
+pDIB->mnBitCount = nBitCount;
+
+if( nColors )
+{
+pDIB->maPalette = rPal;
+pDIB->maPalette.SetEntryCount( nColors );
+}
+
+try
+{
+size_t size = pDIB->mnScanlineSize * pDIB->mnHeight;
+pDIB->mpBits = new sal_uInt8[size];
 #ifdef __SANITIZE_ADDRESS__
-if (!pDIB->mpBits)
-{   // can only happen with ASAN allocator_may_return_null=1
-delete pDIB;
-pDIB = nullptr;
-  

Re: Build Failed on all supported Jenkins platforms

[Huzaifa Iftikhar]

On Fri, Dec 23, 2016 at 7:51 PM, Jan Iversen 
wrote:

>
>

> I am keeping an eye open, but I am on vacation, so please expect a bit of
> delay in getting it merged.
>

The patch was built successfully. No issues even if this doesn't merge
immediately.
http://ci.libreoffice.org/job/lo_gerrit/4605/

Enjoy your vacation :)

Regards,
Huzaifa Iftikhar
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Khaled Hosny]

 vcl/unx/generic/print/genprnpsp.cxx |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 6aa482428ec301cfe45672d38b038fc92de7c4a7
Author: Khaled Hosny 
Date:   Fri Dec 23 18:46:01 2016 +0200

Make these SAL_INFO’s a bit more useful

Use the same log area used in other printing code instead of the overly
broad “vcl” one.

Change-Id: Ie42f10597ae9aa7ee50dba2674c68842710ab360
Reviewed-on: https://gerrit.libreoffice.org/32386
Tested-by: Jenkins 
Reviewed-by: Khaled Hosny 

diff --git a/vcl/unx/generic/print/genprnpsp.cxx 
b/vcl/unx/generic/print/genprnpsp.cxx
index 460247a..a8fb4d1 100644
--- a/vcl/unx/generic/print/genprnpsp.cxx
+++ b/vcl/unx/generic/print/genprnpsp.cxx
@@ -874,7 +874,7 @@ bool PspSalPrinter::StartJob(
 bool bDirect,
 ImplJobSetup* pJobSetup )
 {
-SAL_INFO( "vcl", "PspSalPrinter::StartJob");
+SAL_INFO( "vcl.unx.print", "PspSalPrinter::StartJob");
 GetSalData()->m_pInstance->jobStartedPrinterUpdate();
 m_bPdf  = false;
 if (pFileName)
@@ -931,7 +931,7 @@ bool PspSalPrinter::EndJob()
 else
 {
 bSuccess = m_aPrintJob.EndJob();
-SAL_INFO( "vcl", "PspSalPrinter::EndJob " << bSuccess);
+SAL_INFO( "vcl.unx.print", "PspSalPrinter::EndJob " << bSuccess);
 
 if( bSuccess && m_bPdf )
 {
@@ -945,7 +945,7 @@ bool PspSalPrinter::EndJob()
 
 SalGraphics* PspSalPrinter::StartPage( ImplJobSetup* pJobSetup, bool )
 {
-SAL_INFO( "vcl", "PspSalPrinter::StartPage");
+SAL_INFO( "vcl.unx.print", "PspSalPrinter::StartPage");
 
 JobData::constructFromStreamBuffer( pJobSetup->GetDriverData(), 
pJobSetup->GetDriverDataLen(), m_aJobData );
 m_pGraphics = GetGenericInstance()->CreatePrintGraphics();
@@ -969,7 +969,7 @@ void PspSalPrinter::EndPage()
 {
 m_aPrintJob.EndPage();
 m_aPrinterGfx.Clear();
-SAL_INFO( "vcl", "PspSalPrinter::EndPage");
+SAL_INFO( "vcl.unx.print", "PspSalPrinter::EndPage");
 }
 
 sal_uLong PspSalPrinter::GetErrorCode()
@@ -1016,7 +1016,7 @@ struct PDFPrintFile
 bool PspSalPrinter::StartJob( const OUString* i_pFileName, const OUString& 
i_rJobName, const OUString& i_rAppName,
   ImplJobSetup* i_pSetupData, 
vcl::PrinterController& i_rController )
 {
-SAL_INFO( "vcl", "StartJob with controller: pFilename = " << (i_pFileName 
? *i_pFileName : "") );
+SAL_INFO( "vcl.unx.print", "StartJob with controller: pFilename = " << 
(i_pFileName ? *i_pFileName : "") );
 // mark for endjob
 m_bIsPDFWriterJob = true;
 // reset IsLastPage
@@ -1259,7 +1259,7 @@ bool PspSalPrinter::StartJob( const OUString* 
i_pFileName, const OUString& i_rJo
 for(PDFPrintFile & rPDFFile : aPDFFiles)
 {
 osl_removeFile( rPDFFile.maTmpURL.pData );
-SAL_INFO( "vcl", "removed print PDF file " << rPDFFile.maTmpURL );
+SAL_INFO( "vcl.unx.print", "removed print PDF file " << 
rPDFFile.maTmpURL );
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 sc/qa/unit/subsequent_filters-test.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 76572352dde4742bce3678857da239ae2077ed0f
Author: Stephan Bergmann 
Date:   Fri Dec 23 18:20:36 2016 +0100

Close ScDocSh when done

Change-Id: I5ea07120a77baf71aa9700dd526b05bb9b91f34a

diff --git a/sc/qa/unit/subsequent_filters-test.cxx 
b/sc/qa/unit/subsequent_filters-test.cxx
index de3c6d1..09a8d67 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -926,6 +926,7 @@ void ScFiltersTest::testDoubleThinBorder()
 CPPUNIT_ASSERT(pTop);
 CPPUNIT_ASSERT(pRight);
 CPPUNIT_ASSERT_EQUAL( table::BorderLineStyle::DOUBLE_THIN, 
pRight->GetBorderLineStyle() );
+xDocSh->DoClose();
 }
 
 void ScFiltersTest::testBorderODS()
@@ -3825,6 +3826,7 @@ void ScFiltersTest::testTdf100458()
 CPPUNIT_ASSERT(rDoc.HasValueData(0, 0, 0));
 CPPUNIT_ASSERT_EQUAL(double(0.0), rDoc.GetValue(0,0,0));
 CPPUNIT_ASSERT(!rDoc.HasStringData(0, 0, 0));
+xDocSh->DoClose();
 }
 
 void ScFiltersTest::testTdf100709XLSX()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Crash test update

[Markus Mohrhard]

Hey Khaled,

On Fri, Dec 23, 2016 at 5:40 PM, Khaled Hosny  wrote:

> Can some decipher these emails? They are pretty cryptic and refer to a
> URL that does not tell much as well and the crashlog.txt file there is
> always empty.
>
> Should I just ignore them and assume that people who know what this is
> are already taking care of it?
>
> On Fri, Dec 23, 2016 at 04:18:27PM +, Crashtest VM wrote:
> > New crashtest update available at http://dev-builds.libreoffice.
> org/crashtest/2085d8203b0ff49b6e43ff900f497fb5343708d8/
>



So basically that is how it works for most people. You will also see a
summary in the ESC minutes mentioning if there are outstanding issues.

However helping out is of course appreciated. If crashlog.txt is empty it
means there was no import crash, and if exportCrash.txt is empty it means
that there was no export crash as well. Each line in the files normally
corresponds to one document that crashed.

The csv files that are attached to the mail show the aggregation across the
crash test run with each row representing one crash test run. You can
normally inspect the last two to see if we regressed.

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

Re: Crash test update

[Khaled Hosny]

Can some decipher these emails? They are pretty cryptic and refer to a
URL that does not tell much as well and the crashlog.txt file there is
always empty.

Should I just ignore them and assume that people who know what this is
are already taking care of it?

On Fri, Dec 23, 2016 at 04:18:27PM +, Crashtest VM wrote:
> New crashtest update available at 
> http://dev-builds.libreoffice.org/crashtest/2085d8203b0ff49b6e43ff900f497fb5343708d8/
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Crash test update

[Crashtest VM]

New crashtest update available at 
http://dev-builds.libreoffice.org/crashtest/2085d8203b0ff49b6e43ff900f497fb5343708d8/


exportCrashes.csv
Description: Binary data


importCrash.csv
Description: Binary data


validationErrors.csv
Description: Binary data
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Build Failed

[jan iversen]

> 
> http://ci.libreoffice.org/job/lo_gerrit/4556/
> I want someone to help me out with this.
"Want" is good, but we do expect you to at least check the output files.

Did you have a look at the build output ?
http://ci.libreoffice.org/job/lo_gerrit/4556/Config=linux_clang_dbgutil_64/console

You can see it fails because there is an include file, that cannot be found.

Did you build this locally ? You should have the same error localla.

Rgds
Jan I.
> 
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Open Colour Systems Collection 2.0 released

[Christoph Schäfer]

Open Colour Systems 2.0 Released


freieFarbe e.V. / freeColour is pleased to announce the release of Open Colour 
Systems Collection (OCSC) 2.0.

Following the release of OCSC 1.0, freieFarbe / freeColour has been been 
recognised by German authorities as a non-profit organisation. The release of 
OCSC is the first one after the official recognition.

OCSC 2.0 comprises ten additional colour palettes. More importantly, it is now 
also available in Adobe's Swatch Exchange Format (ASE), as well as a Plain Text 
Format version with the file extension CLF.

All colours have been measured from vendor-supplied colour references with a 
spectrophotometer.

Since freieFarbe e.V. / freeColour is an advocate of the use of the CIE LAB/HLC 
colour model as a free and reasonable alternative to proprietary colour 
collections, colour values in the palette files are in CIE LAB.

Download


SBZ: http://freiefarbe.de/wp-content/uploads/2016/12/OCSC_20_SBZ.zip
SHA1 checksum: 6b2bab7dde9e5fe9e8778ee9f79f31edcaa8cef8

ASE: http://freiefarbe.de/wp-content/uploads/2016/12/OCSC_20_ASE.zip
SHA1 checksum: fea350149e2b95af55f36e283fe597f279d3f79c

CLF: http://freiefarbe.de/wp-content/uploads/2016/12/OCSC_20_CLF.zip
SHA1 checksum: e65fd94db7f0d6484df9ce0cf0288ecd328ec655


In addition, OCSC 2.0 has been released in three RGB versions for use in 
LibreGraphics programmes that don't support the LAB colour model and/or one of 
the formats listed above (yet). The formats are: GPL (GIMP, Inkscape, Calligra 
Office, Krita, MyPaint), SOC (Apache OpenOffice, LibreOffice, OpenOffice.org), 
and XML (Scribus 1.4.x).

Download


GPL: http://freiefarbe.de/wp-content/uploads/2016/12/OCSC_20_GPL.zip
SHA1 checksum: c0eefb3a74f658c9c201d5671b4af6a085650cbb

SOC: http://freiefarbe.de/wp-content/uploads/2016/12/OCSC_20_SOC.zip
SHA1 checksum: 318d8fbaf391b0ec39fa433e807e3ec658381376

XML: http://freiefarbe.de/wp-content/uploads/2016/12/OCSC_20_ScrXML.zip
SHA1 checksum: da456792dc89445022ab4ae1af3f5ccedc722cd6


A complete package with all supported formats is available here: 
http://dtpstudio.de/downloads/freeware/OCSC_20.zip
SHA1 checksum: e65fd94db7f0d6484df9ce0cf0288ecd328ec655


In addition, freieFarbe / freeColour provides other colour-related software for 
free here: http://freecolour.org/



Colour Software Release Planned
===

freieFarbe e.V. / freeColour also intends to release a previously closed-source 
colour software product written in RealBasic as Open Source under a GPL 2+ 
licence. fF / fC hopes to find contributors who are interested in porting the 
code from RealBasic to C++ and Qt, as well as merging the features of 
Swatchbooker and the original product. The majority of the code is UI-related, 
but the essential algorithms (the core of the product) are well-commented. Any 
assistance with respect to the organisation of the release of the source code 
would be welcome.



About freieFarbe e.V. / freeColour:
===


freieFarbe e.V. / freeColour is a non-profit organisation that was founded in 
2016 by German and Swiss colour professionals after having worked as an 
informal initiative without legal status for several years. our motto is "We 
want to unchain colours". The organisation is looking for cooperation with 
colour experts, software developers and users around the globe who share our 
goals. You are invited to become a member and/or contribute your own project.

freieFarbe e.V. / freeColour is convinced that the design world will benefit 
from truly free colours and better colour software.



December 2016

Holger Everding
Christoph Schäfer

www.freiefarbe.de
www.freecolour.org
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Please add an option to set bug reports to "Private"

[Terrence Enger]

On Wed, 2016-12-21 at 07:08 +0100, "Christoph Schäfer"
 wrote asking for a way to send
failing documents so that they
would be accessible only to
developers and admins.

The QA team consists of whoever cares to show up.  We routinely
do some work on bug reports.  So, this proposal would force this
work onto developers and admins.  I am talking about work like
...

(*) Ensure that the bug has not already been reported.

(*) Ensure that the steps for reproduction are clear and
complete.  Generally, they should be adequate even for
someone who does not usually us the feature in question.

(*) Find at least one other system where the bug is evdent.

(*) Determine whether the bug represents a regression form an
earlier version of LibreOffice.

(*) Determine when a regression entered LibreOffice.

On balance, I view the transfer of work to developers as
undesirable.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Please add an option to set bug reports to "Private"

[Jan Iversen]

> Just to be clear, I'm coming from the graphics design and layout community, 
> and I want to support the development of libraries like libfreehand or 
> libpagemaker. For that purpose I used my contacts to layout and DTP experts 
> and asked for sample files, so I could test the importers with all programmes 
> that use them, but primarily LibreOffice. In other words, I and the friendly 
> people who donated from their backups want to help you to fix YOUR bugs. 

I think a lot of the mail in this thread contain a lot of truth (from all). But 
please everybody truth is relative to the viewer and not universal. If 
Christoph has knowledge of multiple problems and test files to show it, then 
lets find a way to make them available, instead of solving the general problem 
(which is far more difficult as described).


> 
> A suggestion from my side would be to grant DLP hackers "Developer" status on 
> Scribus's bugtracker (bugs.scribus.net ) for DTP 
> and vector formats, so I can upload the test files over there as "Private". 
> As "Developers" they would have access to the test files. The status would 
> only be granted if one of the DLP leads (e.g. Fridrich Štrba or David Tardon) 
> can confirm that the person is indeed an active DLP developer.
Thanks Christoph for suggesting a compromise. 

I think it is a good idea ! and please have each problem added as a BZ issue, 
with some link to the Scribus bug tracker (e.g. id), and a not like “if you 
want to work on this bug, please assign it to yourself, and ping Fridrích / 
David / Christoph  to get access to the test document”.

I hope with that solution everybody is happy, and we can all benefit LO being 
even better than it is.

I just have to comment on one thing. The use of “YOUR” is not correct, we 
(whoever that is) do not own the program, it is OUR bugs, where our means 
everybody using LO.

Lets all have some nice days.

rgds
jan I.

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

Build failed for linux_gcc_release_64 on Jenkins

[Abdul Wadood]

I was trying to fix an EasyHack #70998 and submitted a patch. The build was
successful for all platforms except linux_gcc_release_64 on Jenkins. The
build was successful on my system (Ubuntu 16.06LTS).

Here is the link to gerrit
https://gerrit.libreoffice.org/#/c/32354/

Here is the link to console output:
http://ci.libreoffice.org/job/lo_gerrit/4567/console

Help me out.

Regards,
Abdul Wadood
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Stephan Bergmann]

 sc/qa/unit/bugfix-test.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit b4d47ba99526512814f5a5f3c53d980291b1992d
Author: Stephan Bergmann 
Date:   Fri Dec 23 16:24:00 2016 +0100

Close ScDocSh when done

Change-Id: I7b036fca1d595bb2dadcc488a534cbf28ecd345b

diff --git a/sc/qa/unit/bugfix-test.cxx b/sc/qa/unit/bugfix-test.cxx
index 3499109..1be7cf6 100644
--- a/sc/qa/unit/bugfix-test.cxx
+++ b/sc/qa/unit/bugfix-test.cxx
@@ -195,6 +195,8 @@ void ScFiltersTest::testTdf98657()
 
 // this was a NaN before the fix
 CPPUNIT_ASSERT_EQUAL(double(285.0), rDoc.GetValue(ScAddress(1, 1, 0)));
+
+xDocSh->DoClose();
 }
 
 void ScFiltersTest::testTdf88821()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Build Fail

[Khaled Hosny]

On Fri, Dec 23, 2016 at 08:33:29PM +0530, Tamsil Amani wrote:
> I was trying to fix an easyhack #32347 and submitted a patch in which I
> made changes only in the strings thus no logical changes were made to the
> code.
> The build completed successfully on my system (Ubuntu 16.04LTS) however it
> failed on the supported Jenkins Platform.
> 
> This is the link to gerrit
> https://gerrit.libreoffice.org/#/c/32347/
> 
> This is the link to the build information
> http://ci.libreoffice.org/job/lo_gerrit/4558/

You have to check the build log to see why it is failing, e.g.:
http://ci.libreoffice.org/job/lo_gerrit/4558/Config=linux_clang_dbgutil_64/console

But it looks like you didn’t touch this code and someone else broke the
build on master. You can try to rebase the change (I just did that) and
hope the breakage have been fixed in the meantime.

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

Build Failed

[Tamsil Amani]

I was trying to fix an easyhack #32345 and submitted a patch in which:
1) I moved a file from one directory to another.
2) I changed an #include line in whichever files required for the same.

It failed on the supported Jenkins Platform.

This is the link to gerrit
https://gerrit.libreoffice.org/#/c/32345/

This is the link to the build information

http://ci.libreoffice.org/job/lo_gerrit/4556/
I want someone to help me out with this.

Regards,
Tamsil Amani
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Build Fail

[Tamsil Amani]

I was trying to fix an easyhack #32347 and submitted a patch in which I
made changes only in the strings thus no logical changes were made to the
code.
The build completed successfully on my system (Ubuntu 16.04LTS) however it
failed on the supported Jenkins Platform.

This is the link to gerrit
https://gerrit.libreoffice.org/#/c/32347/

This is the link to the build information
http://ci.libreoffice.org/job/lo_gerrit/4558/

I want someone to help me out with this.

Regards,
Tamsil Amani
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Build Failed on all supported Jenkins platforms

[Jan Iversen]

> I won't repeat this mistake in future and apologise for this.  

NO need to apologise, you should see some of the errors I have made in my time, 
this is why we have gerrit. Had you e.g. merged directly to master you would 
have been unpopular.

> I submitted a new patch after rectifying the previous mistake. I hope it 
> builds successfully this time. Thanks for the Help.

I am keeping an eye open, but I am on vacation, so please expect a bit of delay 
in getting it merged.

Have fun.
rgds
jan I.

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

Re: Build Failed on all supported Jenkins platforms

[Huzaifa Iftikhar]

On Fri, Dec 23, 2016 at 7:24 PM, Markus Mohrhard <
markus.mohrh...@googlemail.com> wrote:

> Hey,
>
> On Fri, Dec 23, 2016 at 2:50 PM, Huzaifa Iftikhar 
> wrote:
>
>> I was trying to fix an easyhack #70998 and submitted a patch in which I
>> made changes only in the strings thus no logical changes were made to the
>> code.
>> The build completed successfully on my system (Ubuntu 14.04LTS) however
>> it failed on the supported Jenkins Platform.
>>
>> This is the link to gerrit
>> https://gerrit.libreoffice.org/#/c/32353/
>>
>> This is the link to the build information
>> http://ci.libreoffice.org/job/lo_gerrit/4566/
>>
>> I want someone to help me out with this.
>>
>>
>>
>>
>
> I very much doubt that the same change compiled on your system.
> https://gerrit.libreoffice.org/#/c/32353/1/comphelper/source/container/
> embeddedobjectcontainer.cxx obviously contains code that can not compile.
>
>
Thank you Markus for help. I rectified the above mentioned error and
submitted a new patch.

Regards,
Huzaifa Iftikhar

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

Re: Build Failed on all supported Jenkins platforms

[Huzaifa Iftikhar]

On Fri, Dec 23, 2016 at 7:25 PM, Jan Iversen 
wrote:

>
> I have commented on
>
> https://gerrit.libreoffice.org/#/c/32353/
>
>
Yes I read your comment. Thanks for the help Jan.

>
>
> it is strange how that can compile on your local system. Please have a
> look at the comment and submit a new patch set
>

It was a comment in my local system for my own reference and was written as
"/*/". I don't know how the forward slashes were erased and the
asterisks remained. It was my mistake and also I made the build on my local
system after submitting the patch when the Jenkins build failed and at that
time I had already removed those unwanted asterisks.
I won't repeat this mistake in future and apologise for this.

>
> Remember to use “git commit —amend”
>

I submitted a new patch after rectifying the previous mistake. I hope it
builds successfully this time. Thanks for the Help.

Regards,
Huzaifa Iftikhar
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Build Failed on all supported Jenkins platforms

[Jan Iversen]

> 
> I was trying to fix an easyhack #70998 and submitted a patch in which I made 
> changes only in the strings thus no logical changes were made to the code.
> The build completed successfully on my system (Ubuntu 14.04LTS) however it 
> failed on the supported Jenkins Platform.

I have commented on
> https://gerrit.libreoffice.org/#/c/32353/ 
> 

it is strange how that can compile on your local system. Please have a look at 
the comment and submit a new patch set

Remember to use “git commit —amend”

have a nice day
rgds
jan I.

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

Re: Build Failed on all supported Jenkins platforms

[Markus Mohrhard]

Hey,

On Fri, Dec 23, 2016 at 2:50 PM, Huzaifa Iftikhar 
wrote:

> I was trying to fix an easyhack #70998 and submitted a patch in which I
> made changes only in the strings thus no logical changes were made to the
> code.
> The build completed successfully on my system (Ubuntu 14.04LTS) however it
> failed on the supported Jenkins Platform.
>
> This is the link to gerrit
> https://gerrit.libreoffice.org/#/c/32353/
>
> This is the link to the build information
> http://ci.libreoffice.org/job/lo_gerrit/4566/
>
> I want someone to help me out with this.
>
>
>
>

I very much doubt that the same change compiled on your system.
https://gerrit.libreoffice.org/#/c/32353/1/comphelper/source/container/embeddedobjectcontainer.cxx
obviously contains code that can not compile.

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

Build Failed on all supported Jenkins platforms

[Huzaifa Iftikhar]

I was trying to fix an easyhack #70998 and submitted a patch in which I
made changes only in the strings thus no logical changes were made to the
code.
The build completed successfully on my system (Ubuntu 14.04LTS) however it
failed on the supported Jenkins Platform.

This is the link to gerrit
https://gerrit.libreoffice.org/#/c/32353/

This is the link to the build information
http://ci.libreoffice.org/job/lo_gerrit/4566/

I want someone to help me out with this.

Regards,
Huzaifa Iftikhar
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: cui/source forms/source sc/source sd/source sd/uiconfig sw/source sw/uiconfig

[Federico Bassini]

 cui/source/dialogs/hyperdlg.src  |2 +-
 forms/source/resource/xforms.src |2 +-
 sc/source/ui/src/globstr.src |2 +-
 sc/source/ui/src/scfuncs.src |2 +-
 sd/source/ui/app/strings.src |2 +-
 sd/uiconfig/simpress/ui/publishingdialog.ui  |2 +-
 sw/source/core/undo/undo.src |2 +-
 sw/source/ui/index/cnttab.src|4 ++--
 sw/source/ui/utlui/utlui.src |6 +++---
 sw/uiconfig/swriter/ui/notebookbar_groups.ui |4 ++--
 10 files changed, 14 insertions(+), 14 deletions(-)

New commits:
commit b6aad6de12df9534e82f5a8ef8184cac77e5c6b4
Author: Federico Bassini 
Date:   Mon Oct 17 12:17:00 2016 +0200

tdf#101442 - "hyperlink" to "link"

changing other words "hyperlink" to "link!"

Change-Id: I29d97bab7844183759bc34624a14c0216258ad8b

diff --git a/cui/source/dialogs/hyperdlg.src b/cui/source/dialogs/hyperdlg.src
index 941d8b2..11fc1d8 100644
--- a/cui/source/dialogs/hyperdlg.src
+++ b/cui/source/dialogs/hyperdlg.src
@@ -31,7 +31,7 @@ String RID_SVXSTR_HYPDLG_MACROACT1
 };
 String RID_SVXSTR_HYPDLG_MACROACT2
 {
-Text [ en-US ] = "Trigger hyperlink" ;
+Text [ en-US ] = "Trigger link" ;
 };
 String RID_SVXSTR_HYPDLG_MACROACT3
 {
diff --git a/forms/source/resource/xforms.src b/forms/source/resource/xforms.src
index 2b49443..e4df19a 100644
--- a/forms/source/resource/xforms.src
+++ b/forms/source/resource/xforms.src
@@ -106,7 +106,7 @@ String RID_STR_DATATYPE_STRING
 
 String RID_STR_DATATYPE_URL
 {
-Text [ en-US ] = "Hyperlink";
+Text [ en-US ] = "Link";
 };
 
 String RID_STR_DATATYPE_BOOLEAN
diff --git a/sc/source/ui/src/globstr.src b/sc/source/ui/src/globstr.src
index 0827a6a..357c377 100644
--- a/sc/source/ui/src/globstr.src
+++ b/sc/source/ui/src/globstr.src
@@ -2031,7 +2031,7 @@ Resource RID_GLOBSTR
 };
 String STR_CLICKHYPERLINK
 {
-Text [ en-US ] = "click to open hyperlink:";
+Text [ en-US ] = "click to open link:";
 };
 
 String STR_PRINT_PREVIEW_NODATA
diff --git a/sc/source/ui/src/scfuncs.src b/sc/source/ui/src/scfuncs.src
index 0aec064..85e98ee 100644
--- a/sc/source/ui/src/scfuncs.src
+++ b/sc/source/ui/src/scfuncs.src
@@ -11268,7 +11268,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
 {
 String 1 // Description
 {
-Text [ en-US ] = "Hyperlink." ;
+Text [ en-US ] = "Link." ;
 };
 ExtraData =
 {
diff --git a/sd/source/ui/app/strings.src b/sd/source/ui/app/strings.src
index 2194407..94de063 100644
--- a/sd/source/ui/app/strings.src
+++ b/sd/source/ui/app/strings.src
@@ -843,7 +843,7 @@ String STR_HTMLATTR_TEXT
 
 String STR_HTMLATTR_LINK
 {
-Text [ en-US ] = "Hyperlink";
+Text [ en-US ] = "Link";
 };
 
 String STR_HTMLATTR_VLINK
diff --git a/sd/uiconfig/simpress/ui/publishingdialog.ui 
b/sd/uiconfig/simpress/ui/publishingdialog.ui
index 849423e..28f3a5f 100644
--- a/sd/uiconfig/simpress/ui/publishingdialog.ui
+++ b/sd/uiconfig/simpress/ui/publishingdialog.ui
@@ -1478,7 +1478,7 @@
 
 
   
-Hyper_link
+_Link
 False
 True
 True
diff --git a/sw/source/core/undo/undo.src b/sw/source/core/undo/undo.src
index c8e0aa3..f045c85 100644
--- a/sw/source/core/undo/undo.src
+++ b/sw/source/core/undo/undo.src
@@ -404,7 +404,7 @@ String STR_INSERT_URLBTN
 };
 String STR_INSERT_URLTXT
 {
-Text [ en-US ] = "Insert Hyperlink";
+Text [ en-US ] = "Insert Link";
 };
 String STR_DELETE_INVISIBLECNTNT
 {
diff --git a/sw/source/ui/index/cnttab.src b/sw/source/ui/index/cnttab.src
index 82f561a..1aaff70 100644
--- a/sw/source/ui/index/cnttab.src
+++ b/sw/source/ui/index/cnttab.src
@@ -122,11 +122,11 @@ String STR_TOKEN_HELP_CHAPTER_INFO
 };
 String STR_TOKEN_HELP_LINK_START
 {
-Text [ en-US ] = "Hyperlink start";
+Text [ en-US ] = "Link start";
 };
 String STR_TOKEN_HELP_LINK_END
 {
-Text [ en-US ] = "Hyperlink end";
+Text [ en-US ] = "Link end";
 };
 String STR_TOKEN_HELP_AUTHORITY
 {
diff --git a/sw/source/ui/utlui/utlui.src b/sw/source/ui/utlui/utlui.src
index 37207f4..d471dc1 100644
--- a/sw/source/ui/utlui/utlui.src
+++ b/sw/source/ui/utlui/utlui.src
@@ -137,7 +137,7 @@ String STR_EVENT_MOUSEOVER_OBJECT
 };
 String STR_EVENT_MOUSECLICK_OBJECT
 {
-Text [ en-US ] = "Trigger hyperlink" ;
+Text [ en-US ] = "Trigger Link" ;
 };
 String STR_EVENT_MOUSEOUT_OBJECT
 {
@@ -201,7 +201,7 @@ String STR_CONTENT_TYPE_REGION
 };
 String STR_CONTENT_TYPE_URLFIELD
 {
-Text [ en-US ] = "Hyperlinks" ;
+Text [ en-US ] = "Links" ;
 };
 String STR_CONTENT_TYPE_REFERENCE
 {
@@ -281,7 +281,7 @@ String STR_CONTENT_TYPE_SINGLE_REGION
 };
 String STR_CONTENT_TYP

[Libreoffice-commits] core.git: bin/gbuild-to-ide

[jan Iversen]

 bin/gbuild-to-ide |   36 +---
 1 file changed, 25 insertions(+), 11 deletions(-)

New commits:
commit 37907576d81dae2e1d31e4391cf15f6b1ad3b0dd
Author: jan Iversen 
Date:   Wed Dec 21 18:43:54 2016 +0100

First attempt to make xcode project work again.

There are still a problem with references, but committing this part, since
it is controlled, and before conflicting with other changes.

Change-Id: I6a7551bfbb44edc5876e5432ca04bfd595cb3fab

diff --git a/bin/gbuild-to-ide b/bin/gbuild-to-ide
index e18f3bd..981b1c5 100755
--- a/bin/gbuild-to-ide
+++ b/bin/gbuild-to-ide
@@ -187,7 +187,8 @@ class GbuildParser:
 self.target_by_path[path] = set()
 self.target_by_path[path] |= set([target])
 for path in self.target_by_path:
-if len(set(self.target_by_path[path])) > 1:
+x = self.target_by_path[path]
+if path != '' and len(set(self.target_by_path[path])) > 1:
 print('fdo#70422: multiple target use dir %s: %s' % (
 path, ', '.join([target.short_name() for target in 
set(self.target_by_path[path])])))
 for location in self.target_by_location:
@@ -280,7 +281,7 @@ class 
EclipseCDTIntegrationGenerator(IdeIntegrationGenerator):
 
 
 
-""" 
+"""
 
 for module in self.gbuildparser.modulenamelist:
 tempxml = []
@@ -305,7 +306,7 @@ class 
EclipseCDTIntegrationGenerator(IdeIntegrationGenerator):
 macrokey = macroskeyvalue[0]
 macrovalue = macroskeyvalue[1]
 if macrovalue[-1:] == "\n":
-macrovalue = macrovalue[:-1] 
+macrovalue = macrovalue[:-1]
 templine = "%s%s\n" 
%(macrokey, macrovalue)
 tempxml.insert(-13, templine)
 tempxml="".join(tempxml)
@@ -320,7 +321,7 @@ class 
EclipseCDTIntegrationGenerator(IdeIntegrationGenerator):
 def emit(self):
 self.create_include_paths()
 self.create_macros()
-self.create_settings_file() 
+self.create_settings_file()
 
 class DebugIntegrationGenerator(IdeIntegrationGenerator):
 
@@ -567,6 +568,8 @@ class XcodeIntegrationGenerator(IdeIntegrationGenerator):
 file.write('"%s"' % object)
 elif isinstance(object, dict):
 self.write_dict(object, file, indent)
+elif isinstance(object, list):
+self.write_list(object, file, indent)
 
 # Write a dictionary out as an "old-style (NeXT) ASCII plist"
 def write_dict(self, dict, file, indent):
@@ -580,6 +583,13 @@ class XcodeIntegrationGenerator(IdeIntegrationGenerator):
 self.indent(file, indent)
 file.write('}')
 
+def write_list(self, list, file, indent):
+file.write('(')
+for key in list:
+self.write_object(key, file, 1)
+file.write(',')
+file.write(')')
+
 def write_dict_to_plist(self, dict, file):
 file.write('// !$*UTF8*$!\n')
 self.write_dict(dict, file, 0)
@@ -601,18 +611,21 @@ class XcodeIntegrationGenerator(IdeIntegrationGenerator):
 return result
 
 def generate_root_object(self, modulename):
-result = {'isa': 'PBXProject',
-  'attributes': {'LastUpgradeCheck': '0500',
- 'ORGANIZATIONNAME': 'LibreOffice'},
-  'buildConfigurationList': self.generate_id(),
+result = {'attributes': {'LastUpgradeCheck': '0500',
+ 'ORGANIZATIONNAME': 'LibreOffice',
+ 'TargetAttributes' : {self.targetId : 
{'CreatedOnToolsVersion' : '8.2',
+
'ProvisioningStyle' : 'Automatic'}}},
   'compatibilityVersion': 'Xcode 3.2',
+  'developmentRegion': 'English',
+  'isa': 'PBXProject',
   'hasScannedForEncodings': 0,
   'knownRegions': ['en'],
   'mainGroup': self.mainGroupId,
   'productRefGroup': self.productRefGroupId,
   'projectDirPath': '',
   'projectRoot': '',
-  'targets': self.targetId}
+  'buildConfigurationList': self.generate_id(),
+  'targets': [self.targetId]}
 return result
 
 def generate_target(self, modulename):
@@ -623,7 +636,7 @@ class XcodeIntegrationGenerator(IdeIntegrationGenerator):
   'dependencies': [],
   'name': modulename,
   'productName': modulename,
-  'productReference': self.productReferenceId,
+  'productRefGroup': self.productGroupId,
   'productType': self.get_product_type(modulename)}
 return result
 
@@ -634,11 +647,12 @@ class XcodeIntegrationGenerator(IdeIntegrationGenerator):
 return result
 

[Libreoffice-commits] core.git: compilerplugins/clang svx/source

[Noel Grandin]

 compilerplugins/clang/mergeclasses.results |1 -
 svx/source/form/fmscriptingenv.cxx |   19 +++
 2 files changed, 3 insertions(+), 17 deletions(-)

New commits:
commit 0b55d7e0fe9ec14cf889201ef3d9fc71f1cf7df4
Author: Noel Grandin 
Date:   Fri Dec 23 10:59:56 2016 +0200

merge IScript with NewStyleUNOScript

Change-Id: Iae70d0780678eb8df8a9e57fce5fc2f6c5ed427e
Reviewed-on: https://gerrit.libreoffice.org/32375
Reviewed-by: Noel Grandin 
Tested-by: Noel Grandin 

diff --git a/compilerplugins/clang/mergeclasses.results 
b/compilerplugins/clang/mergeclasses.results
index ab9a01e..fc51994 100644
--- a/compilerplugins/clang/mergeclasses.results
+++ b/compilerplugins/clang/mergeclasses.results
@@ -345,7 +345,6 @@ merge svx::IFocusObserver with svx::FmTextControlShell
 merge svx::IPropertyValueProvider with svx::PropertyValueProvider
 merge svx::RegistrationItemSetHolder with svx::DatabaseRegistrationDialog
 merge svx::sidebar::SvxShapeCommandsMap with svx::sidebar::DefaultShapesPanel
-merge svxform::(anonymous namespace)::IScript with svxform::(anonymous 
namespace)::NewStyleUNOScript
 merge svxform::DispatchInterceptor with svxform::FormController
 merge svxform::IFormScriptingEnvironment with svxform::FormScriptingEnvironment
 merge sw::ICoreFrameStyle with SwXFrameStyle
diff --git a/svx/source/form/fmscriptingenv.cxx 
b/svx/source/form/fmscriptingenv.cxx
index f80ca7a..e6a8417 100644
--- a/svx/source/form/fmscriptingenv.cxx
+++ b/svx/source/form/fmscriptingenv.cxx
@@ -950,19 +950,7 @@ namespace svxform
 
 namespace
 {
-
-//. NewStyleUNOScript
-
-class SAL_NO_VTABLE IScript
-{
-public:
-virtual void invoke( const Sequence< Any >& _rArguments, Any& 
_rSynchronousResult ) = 0;
-
-virtual ~IScript() { }
-};
-typedef std::shared_ptr< IScript >  PScript;
-
-class NewStyleUNOScript : public IScript
+class NewStyleUNOScript
 {
 SfxObjectShell& m_rObjectShell;
 const OUString   m_sScriptCode;
@@ -974,8 +962,7 @@ namespace svxform
 {
 }
 
-// IScript
-virtual void invoke( const Sequence< Any >& _rArguments, Any& 
_rSynchronousResult ) override;
+void invoke( const Sequence< Any >& _rArguments, Any& 
_rSynchronousResult );
 };
 
 
@@ -1019,7 +1006,7 @@ namespace svxform
 return;
 
 // the script to execute
-PScript pScript;
+std::shared_ptr< NewStyleUNOScript > pScript;
 
 if ( _rEvent.ScriptType != "StarBasic" )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin]

 include/svtools/brwbox.hxx|   13 +-
 svtools/source/brwbox/brwbox1.cxx |  174 --
 svtools/source/brwbox/brwbox2.cxx |  107 +++
 3 files changed, 149 insertions(+), 145 deletions(-)

New commits:
commit cfcbbfaeb4cfee5ffeb968dc21d1c266a870d89f
Author: Noel Grandin 
Date:   Fri Dec 23 13:15:43 2016 +0200

remove unnecessary casting in BrowseBox::pDataWin member

Change-Id: I1187691c19808c53ff3839cfd8892ab06d36053e
Reviewed-on: https://gerrit.libreoffice.org/32381
Tested-by: Jenkins 
Reviewed-by: Noel Grandin 

diff --git a/include/svtools/brwbox.hxx b/include/svtools/brwbox.hxx
index 6a97897..237ee5c 100644
--- a/include/svtools/brwbox.hxx
+++ b/include/svtools/brwbox.hxx
@@ -197,9 +197,9 @@ public:
 static const sal_uInt16 HandleColumnId = 0;
 
 private:
-VclPtr pDataWin;   // window to display data rows
-VclPtr  pVScroll;   // vertical scrollbar
-VclPtr  aHScroll;   // horizontal scrollbar
+VclPtr pDataWin;   // window to display data rows
+VclPtr  pVScroll;   // vertical scrollbar
+VclPtr  aHScroll;   // horizontal scrollbar
 
 longnDataRowHeight; // height of a single data-row
 sal_uInt16  nTitleLines;// number of lines in title row
@@ -356,8 +356,7 @@ protected:
 virtual voidVisibleRowsChanged( long nNewTopRow, sal_uInt16 nNumRows);
 
 // number of visible rows in the window (incl. "truncated" rows)
-sal_uInt16  GetVisibleRows()
-{ return 
(sal_uInt16)((pDataWin->GetOutputSizePixel().Height() - 1 )/ GetDataRowHeight() 
+ 1); }
+sal_uInt16  GetVisibleRows();
 longGetTopRow() { return nTopRow; }
 sal_uInt16  GetFirstVisibleColNumber() const { return nFirstCol; }
 
@@ -436,7 +435,7 @@ public:
 
 // map-mode and font control
 voidSetFont( const vcl::Font& rNewFont );
-const vcl::Font& GetFont() const { return pDataWin->GetFont(); }
+const vcl::Font& GetFont() const;
 voidSetTitleFont( const vcl::Font& rNewFont )
 { Control::SetFont( rNewFont ); }
 
@@ -505,7 +504,7 @@ public:
 boolIsResizing() const { return bResizing; }
 
 // access to positions of fields, column and rows
-vcl::Window&GetDataWindow() const { return *pDataWin; }
+vcl::Window&GetDataWindow() const;
 Rectangle   GetRowRectPixel( long nRow ) const;
 Rectangle   GetFieldRectPixel( long nRow, sal_uInt16 nColId,
bool bRelToBrowser = true) const;
diff --git a/svtools/source/brwbox/brwbox1.cxx 
b/svtools/source/brwbox/brwbox1.cxx
index 915e0e4..c16c1d6 100644
--- a/svtools/source/brwbox/brwbox1.cxx
+++ b/svtools/source/brwbox/brwbox1.cxx
@@ -36,7 +36,6 @@
 
 
 #define SCROLL_FLAGS (ScrollFlags::Clip | ScrollFlags::NoChildren)
-#define getDataWindow() (static_cast(pDataWin.get()))
 
 using namespace com::sun::star::accessibility::AccessibleEventId;
 using namespace com::sun::star::accessibility::AccessibleTableModelChangeType;
@@ -62,9 +61,7 @@ void BrowseBox::ConstructImpl( BrowserMode nMode )
 SAL_INFO("svtools", "BrowseBox:ConstructImpl " << this );
 bMultiSelection = false;
 pColSel = nullptr;
-pDataWin = nullptr;
 pVScroll = nullptr;
-
 pDataWin = VclPtr::Create( this ).get();
 pCols = new BrowserColumns;
 m_pImpl.reset( new ::svt::BrowseBoxImpl() );
@@ -106,7 +103,7 @@ void BrowseBox::ConstructImpl( BrowserMode nMode )
 SetMode( nMode );
 bSelectionIsVisible = bKeepHighlight;
 bHasFocus = HasChildPathFocus();
-getDataWindow()->nCursorHidden =
+pDataWin->nCursorHidden =
 ( bHasFocus ? 0 : 1 ) + ( GetUpdateMode() ? 0 : 1 );
 }
 
@@ -136,8 +133,8 @@ void BrowseBox::dispose()
 }
 
 Hide();
-getDataWindow()->pHeaderBar.disposeAndClear();
-getDataWindow()->pCornerWin.disposeAndClear();
+pDataWin->pHeaderBar.disposeAndClear();
+pDataWin->pCornerWin.disposeAndClear();
 pDataWin.disposeAndClear();
 pVScroll.disposeAndClear();
 aHScroll.disposeAndClear();
@@ -158,15 +155,15 @@ void BrowseBox::dispose()
 
 short BrowseBox::GetCursorHideCount() const
 {
-return getDataWindow()->nCursorHidden;
+return pDataWin->nCursorHidden;
 }
 
 
 void BrowseBox::DoShowCursor( const char * )
 {
-if (!getDataWindow())
+if (!pDataWin)
 return;
-short nHiddenCount = --getDataWindow()->nCursorHidden;
+short nHiddenCount = --pDataWin->nCursorHidden;
 if (PaintCursorIfHiddenOnce())
 {
 if (1 == nHiddenCount)
@@ -182,7 +179,7 @@ void BrowseBox::DoShowCursor( const char * )
 
 void BrowseBox::DoHideCursor( const char * )
 {
-short nHiddenCount = ++getDataWindow()->nCursorHidden;
+short nHiddenCount = ++pDataWin->nCursorHidden;
 if (PaintCursorIfHiddenOnce())
 {
 if (2 == nHiddenCount)
@@ -198,7 +195,

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

[Stephan Bergmann]

 sc/qa/unit/subsequent_export-test.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 0c267bbc2c023ba5c0c905c91c3324aab6ce00cb
Author: Stephan Bergmann 
Date:   Fri Dec 23 12:46:42 2016 +0100

Close ScDocSh when done

Change-Id: Ic98999566da306f7cf5da81f8e7809ec36729513

diff --git a/sc/qa/unit/subsequent_export-test.cxx 
b/sc/qa/unit/subsequent_export-test.cxx
index 0473701..67b77fb 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -3901,6 +3901,7 @@ void ScExportTest::testHiddenRepeatedRowsODS()
 CPPUNIT_ASSERT(bHidden);
 CPPUNIT_ASSERT_EQUAL((SCROW)0, nFirstRow);
 CPPUNIT_ASSERT_EQUAL((SCROW)20, nLastRow);
+xDocSh->DoClose();
 }
 
 void ScExportTest::testHyperlinkTargetFrameODS()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin]

 compilerplugins/clang/mergeclasses.results |1 -
 include/svx/nbdtmg.hxx |   28 +++-
 svx/source/sidebar/nbdtmg.cxx  |   11 ++-
 3 files changed, 9 insertions(+), 31 deletions(-)

New commits:
commit c4c23515d6f94f5d06215a9b0f9ca605655e3497
Author: Noel Grandin 
Date:   Fri Dec 23 10:44:33 2016 +0200

merge svx::sidebar::BulletsSettings with svx::sidebar::BulletsSettings_Impl

Change-Id: I7cf6bb4cf3aa532718753904c2100882b0df6775
Reviewed-on: https://gerrit.libreoffice.org/32373
Tested-by: Jenkins 
Reviewed-by: Noel Grandin 

diff --git a/compilerplugins/clang/mergeclasses.results 
b/compilerplugins/clang/mergeclasses.results
index 8a7db69..ab9a01e 100644
--- a/compilerplugins/clang/mergeclasses.results
+++ b/compilerplugins/clang/mergeclasses.results
@@ -344,7 +344,6 @@ merge svx::IControllerFeatureInvalidation with FmXFormShell
 merge svx::IFocusObserver with svx::FmTextControlShell
 merge svx::IPropertyValueProvider with svx::PropertyValueProvider
 merge svx::RegistrationItemSetHolder with svx::DatabaseRegistrationDialog
-merge svx::sidebar::BulletsSettings with svx::sidebar::BulletsSettings_Impl
 merge svx::sidebar::SvxShapeCommandsMap with svx::sidebar::DefaultShapesPanel
 merge svxform::(anonymous namespace)::IScript with svxform::(anonymous 
namespace)::NewStyleUNOScript
 merge svxform::DispatchInterceptor with svxform::FormController
diff --git a/include/svx/nbdtmg.hxx b/include/svx/nbdtmg.hxx
index bfab007..d79976b 100644
--- a/include/svx/nbdtmg.hxx
+++ b/include/svx/nbdtmg.hxx
@@ -76,28 +76,14 @@ typedef std::vector< std::shared_ptr > 
NumSettingsArr_Impl;
 
 class  SVX_DLLPUBLIC BulletsSettings
 {
-public:
-boolbIsCustomized;
-rtl::OUString   sDescription;
-public:
-BulletsSettings() :
-bIsCustomized(false)
-{}
-virtual ~BulletsSettings(){}
+public:
+boolbIsCustomized;
+rtl::OUString   sDescription;
+sal_Unicode cBulletChar;
+vcl::Font   aFont;
+BulletsSettings() : bIsCustomized(false), cBulletChar(0) {}
 };
 
-class  SVX_DLLPUBLIC BulletsSettings_Impl:public BulletsSettings
-{
-public:
-sal_Unicode cBulletChar;
-vcl::Font   aFont;
-
-public:
-BulletsSettings_Impl()
-: cBulletChar(0)
-{}
-virtual ~BulletsSettings_Impl() override {}
-};
 
 class  SVX_DLLPUBLIC NumberSettings_Impl
 {
@@ -180,7 +166,7 @@ class SVX_DLLPUBLIC BulletsTypeMgr: public NBOTypeMgrBase
 public:
 static sal_Unicode aDynamicBulletTypes[DEFAULT_BULLET_TYPES];
 static sal_Unicode aDynamicRTLBulletTypes[DEFAULT_BULLET_TYPES];
-static BulletsSettings_Impl* pActualBullets[DEFAULT_BULLET_TYPES];
+static BulletsSettings* pActualBullets[DEFAULT_BULLET_TYPES];
 public:
 BulletsTypeMgr();
 virtual ~BulletsTypeMgr() override {}
diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx
index af5a2c2..ac95d7b 100644
--- a/svx/source/sidebar/nbdtmg.cxx
+++ b/svx/source/sidebar/nbdtmg.cxx
@@ -237,7 +237,7 @@ void NBOTypeMgrBase::ImplStore(const OUString& filename)
 }
 
 // Character Bullet Type lib
-BulletsSettings_Impl* BulletsTypeMgr::pActualBullets[] 
={nullptr,nullptr,nullptr,nullptr,nullptr,nullptr,nullptr,nullptr};
+BulletsSettings* BulletsTypeMgr::pActualBullets[] 
={nullptr,nullptr,nullptr,nullptr,nullptr,nullptr,nullptr,nullptr};
 sal_Unicode BulletsTypeMgr::aDynamicBulletTypes[]={' ',' ',' ',' ',' ',' ',' 
',' '};
 sal_Unicode BulletsTypeMgr::aDynamicRTLBulletTypes[]={' ',' ',' ',' ',' ',' 
',' ',' '};
 
@@ -260,7 +260,7 @@ void BulletsTypeMgr::Init()
 
 for (sal_uInt16 i=0;icBulletChar = aDefaultBulletTypes[i];
 pActualBullets[i]->aFont =rActBulletFont;
 pActualBullets[i]->sDescription = SVX_RESSTR( 
RID_SVXSTR_BULLET_DESCRIPTION_0 + i );
@@ -306,7 +306,6 @@ sal_uInt16 
BulletsTypeMgr::GetNBOIndexForNumRule(SvxNumRule& aNum,sal_uInt16 mLe
 }
 }
 }*/
-//nLength = sizeof(pActualBullets)/sizeof(BulletsSettings_Impl);
 for(sal_uInt16 i = nFromIndex; i < DEFAULT_BULLET_TYPES; i++)
 {
 if ( (cChar == pActualBullets[i]->cBulletChar||
@@ -354,7 +353,6 @@ void BulletsTypeMgr::RelplaceNumRule(SvxNumRule& aNum, 
sal_uInt16 nIndex, sal_uI
 
 aDynamicBulletTypes[nIndex] = cChar;
 }*/
-//nLength = sizeof(pActualBullets)/sizeof(BulletsSettings_Impl);
 if ( nIndex >= DEFAULT_BULLET_TYPES )
 return;
 
@@ -394,7 +392,6 @@ void BulletsTypeMgr::ApplyNumRule(SvxNumRule& aNum, 
sal_uInt16 nIndex, sal_uInt1
 
 cChar = aDynamicBulletTypes[nIndex];
 }*/
-//nLength = sizeof(pActualBullets)/sizeof(BulletsSettings_Impl);
 if ( nIndex >= DEFAULT_BULLET_TYPES )
 return;
 cChar = pActualBullets[nIndex]->cBulletChar;
@@ -424,8 +421,6 @@ void BulletsTypeMgr::ApplyNumRule(SvxNumRule& aNum, 
sal_uInt16 

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

[Noel Grandin]

 compilerplugins/clang/mergeclasses.results |1 
 rsc/inc/rscdef.hxx |   33 +---
 rsc/inc/rsctree.hxx|   17 --
 rsc/source/tools/rscdef.cxx|   34 -
 rsc/source/tools/rsctree.cxx   |   29 
 5 files changed, 49 insertions(+), 65 deletions(-)

New commits:
commit b641929e69aa5917536fad72644d0da4d67f8adc
Author: Noel Grandin 
Date:   Fri Dec 23 10:50:17 2016 +0200

merge StringNode with RscDefine

Change-Id: Ia64b7419ccbb06ff55907717963864caef2023a8
Reviewed-on: https://gerrit.libreoffice.org/32374
Tested-by: Jenkins 
Reviewed-by: Noel Grandin 

diff --git a/compilerplugins/clang/mergeclasses.results 
b/compilerplugins/clang/mergeclasses.results
index df4df30..8a7db69 100644
--- a/compilerplugins/clang/mergeclasses.results
+++ b/compilerplugins/clang/mergeclasses.results
@@ -137,7 +137,6 @@ merge StgAvlIterator with StgIterator
 merge StgAvlNode with StgDirEntry
 merge StgCache with StgIo
 merge StgReader with WW8Reader
-merge StringNode with RscDefine
 merge SvListView with SvTreeListBox
 merge SvXMLExportItemMapper with SwXMLTableItemMapper_Impl
 merge SvXMLImportItemMapper with SwXMLImportTableItemMapper_Impl
diff --git a/rsc/inc/rscdef.hxx b/rsc/inc/rscdef.hxx
index 2a21818..e336fac 100644
--- a/rsc/inc/rscdef.hxx
+++ b/rsc/inc/rscdef.hxx
@@ -114,34 +114,41 @@ public:
 };
 
 /*** R s c D e f i n e ***/
-class RscDefine : public StringNode
+class RscDefine : public NameNode
 {
 friend class RscFileTab;
 friend class RscDefineList;
 friend class RscDefTree;
 friend class RscExpression;
 friend class RscId;
+
 sal_uLong   lFileKey;   // file the define belongs to
 sal_uInt32  nRefCount;  // reference count to this object
 sal_Int32   lId;// identifier
-RscExpression * pExp;   // expression
+RscExpression * pExp;   // expression
+OString m_aName;
+
+virtual COMPARE Compare( const NameNode * ) const override;
+virtual COMPARE Compare( const void * ) const override;
+
 protected:
 
-RscDefine( sal_uLong lFileKey, const OString& rDefName,
+RscDefine( sal_uLong lFileKey, const OString& rDefName,
sal_Int32 lDefId );
-RscDefine( sal_uLong lFileKey, const OString& rDefName,
+RscDefine( sal_uLong lFileKey, const OString& rDefName,
RscExpression * pExpression );
-virtual ~RscDefine() override;
-voidIncRef(){ nRefCount++; }
-voidDecRef();
-voidDefineToNumber();
+virtual ~RscDefine() override;
+
+void  IncRef() { nRefCount++; }
+void  DecRef();
+void  DefineToNumber();
 
-using StringNode::Search;
 public:
-RscDefine * Search( const char * );
-sal_uLong   GetFileKey() const { return lFileKey; }
-voidEvaluate();
-sal_Int32   GetNumber() const  { return lId;  }
+sal_uLong  GetFileKey() const { return lFileKey; }
+void   Evaluate();
+sal_Int32  GetNumber() const  { return lId;  }
+RscDefine* Search( const char * ) const;
+const OString& GetName() const { return m_aName; }
 };
 
 typedef ::std::vector< RscDefine* > RscSubDefList;
diff --git a/rsc/inc/rsctree.hxx b/rsc/inc/rsctree.hxx
index 62db17b..c6de949 100644
--- a/rsc/inc/rsctree.hxx
+++ b/rsc/inc/rsctree.hxx
@@ -71,23 +71,6 @@ public:
 virtual sal_uInt32  GetId() const;
 };
 
-class StringNode : public NameNode
-{
-virtual COMPARE Compare( const NameNode * ) const override;
-virtual COMPARE Compare( const void * ) const override;
-
-protected:
-using NameNode::Search;
-
-OString m_aName;
-
-public:
-StringNode(const OString& rStr) { m_aName = rStr; }
-
-StringNode* Search( const char * ) const;
-const OString&  GetName() const { return m_aName; }
-};
-
 #endif // INCLUDED_RSC_INC_RSCTREE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/rsc/source/tools/rscdef.cxx b/rsc/source/tools/rscdef.cxx
index 9beb17e..2e2a057 100644
--- a/rsc/source/tools/rscdef.cxx
+++ b/rsc/source/tools/rscdef.cxx
@@ -115,7 +115,7 @@ OString RscId::GetName() const
 }
 
 RscDefine::RscDefine( sal_uLong lKey, const OString& rDefName, sal_Int32 
lDefId )
-: StringNode( rDefName )
+: m_aName( rDefName )
 {
 nRefCount = 0;
 lFileKey  = lKey;
@@ -125,8 +125,7 @@ RscDefine::RscDefine( sal_uLong lKey, const OString& 
rDefName, sal_Int32 lDefId
 
 RscDefine::RscDefine( sal_uLong lKey, const OString& rDefName,
   RscExpression * pExpression  )
-: StringNode( rDefName )
-, lId(0)
+: lId(0), m_aName( rDefName )
 {
 nRefCount = 0;
 lFileKey  = lKey;
@@ -163,9 +162,34 @@ void RscDefine::Evaluate()
 pExp->Evaluate( &lId );
 }
 
-RscDefine * RscDefi

[Libreoffice-commits] dev-tools.git: esc-reporting/esc-report.py

[Xisco Fauli]

 esc-reporting/esc-report.py |   52 +++-
 1 file changed, 28 insertions(+), 24 deletions(-)

New commits:
commit 628372fcdc145ad31e51259340ea08c6e72270c2
Author: Xisco Fauli 
Date:   Fri Dec 23 12:16:59 2016 +0100

Use the same indention as in the esc minutes

diff --git a/esc-reporting/esc-report.py b/esc-reporting/esc-report.py
index 761cde1..c3b4b9d 100755
--- a/esc-reporting/esc-report.py
+++ b/esc-reporting/esc-report.py
@@ -393,105 +393,109 @@ def report_qa():
 
 reporters = sorted(statList['people'], key=lambda k: 
(statList['people'][k]['qa']['1week']['owner']), reverse=True)
 
-print("\n+ top 10 bugs reporters:", file=fp)
+print("\n  + top 10 bugs reporters:", file=fp)
 top10reporters = reporters[0:10]
-max_width = 0
+max_width = 20
 for i in top10reporters:
   if statList['people'][i]['qa']['1week']['owner'] == 0:
 break
   max_width = max(max_width, len(statList['people'][i]['name']))
 
-for index, item in enumerate(top10reporters):
+for item in top10reporters:
   if statList['people'][item]['qa']['1week']['owner'] == 0:
 break
-  print('  {0:2d}. {1:{3}s} :{2:3d}'.format( index + 1,
+  print('{0:{2}s} {1:3d}'.format(
 statList['people'][item]['name'], 
statList['people'][item]['qa']['1week']['owner'],
 max_width), file=fp)
 
 fixers = sorted(statList['people'], key=lambda k: 
(statList['people'][k]['qa']['1week']['fixed']), reverse=True)
 
-print("\n+ top 10 bugs fixers:", file=fp)
+print("\n  + top 10 bugs fixers:", file=fp)
 top10fixers = fixers[0:10]
-max_width = 0
+max_width = 20
 for i in top10fixers:
   if statList['people'][i]['qa']['1week']['fixed'] == 0:
 break
   max_width = max(max_width, len(statList['people'][i]['name']))
 
-for index, item in enumerate(top10fixers):
+for item in top10fixers:
   if statList['people'][item]['qa']['1week']['fixed'] == 0:
 break
-  print('  {0:2d}. {1:{3}s} :{2:3d}'.format( index + 1,
+  print('{0:{2}s} {1:3d}'.format(
 statList['people'][item]['name'], 
statList['people'][item]['qa']['1week']['fixed'],
 max_width), file=fp)
 
 
 bisected = sorted(statList['people'], key=lambda k: 
(statList['people'][k]['qa']['1week']['bisected']), reverse=True)
 
-print("\n+ Bisected done by:", file=fp)
+print("\nBisected", file=fp)
+print("\n  + Done by:", file=fp)
 top10bisected = bisected[0:10]
-max_width = 0
+max_width = 20
 for i in top10bisected:
   if statList['people'][i]['qa']['1week']['bisected'] == 0:
 break
   max_width = max(max_width, len(statList['people'][i]['name']))
 
-for index, item in enumerate(top10bisected):
+for item in top10bisected:
   if statList['people'][item]['qa']['1week']['bisected'] == 0:
 break
-  print('  {0:2d}. {1:{3}s} :{2:3d}'.format( index + 1,
+  print('{0:{2}s} {1:3d}'.format(
 statList['people'][item]['name'], 
statList['people'][item]['qa']['1week']['bisected'],
 max_width), file=fp)
 
 bibisected = sorted(statList['people'], key=lambda k: 
(statList['people'][k]['qa']['1week']['bibisected']), reverse=True)
 
-print("\n+ Bibisected done by:", file=fp)
+print("\nBibisected", file=fp)
+print("\n  + Done by:", file=fp)
 top10bibisected = bibisected[0:10]
-max_width = 0
+max_width = 20
 for i in top10bibisected:
   if statList['people'][i]['qa']['1week']['bibisected'] == 0:
 break
   max_width = max(max_width, len(statList['people'][i]['name']))
 
-for index, item in enumerate(top10bibisected):
+for item in top10bibisected:
   if statList['people'][item]['qa']['1week']['bibisected'] == 0:
 break
-  print('  {0:2d}. {1:{3}s} :{2:3d}'.format( index + 1,
+  print('{0:{2}s} {1:3d}'.format(
 statList['people'][item]['name'], 
statList['people'][item]['qa']['1week']['bibisected'],
 max_width), file=fp)
 
 regression = sorted(statList['people'], key=lambda k: 
(statList['people'][k]['qa']['1week']['regression']), reverse=True)
 
-print("\n+ Regression added by:", file=fp)
+print("\nRegressions", file=fp)
+print("\n  + Done by:", file=fp)
 top10regression = regression[0:10]
-max_width = 0
+max_width = 20
 for i in top10regression:
   if statList['people'][i]['qa']['1week']['regression'] == 0:
 break
   max_width = max(max_width, len(statList['people'][i]['name']))
 
-for index, item in enumerate(top10regression):
+for item in top10regression:
   if statList['people'][item]['qa']['1week']['regression'] == 0:
 break
-  print('  {0:2d}. {1:{3}s} :{2:3d}'.format( index + 1,
+  print('{0:{2}s} {1:3d}'.format(
 statList['people'

[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - framework/source

[Maxim Monastirsky]

 framework/source/uielement/menubarmanager.cxx |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 81202718487f716e002c5f5bd87ab5e3ed30615d
Author: Maxim Monastirsky 
Date:   Thu Dec 22 01:03:31 2016 +0200

tdf#104818 Show the right label when a11y enabled

Change-Id: If4da5b9435e96e3830bac3d01e06f7ddc87754eb
(cherry picked from commit c9303b98ad69213fe346d0657a8bca5ac8fa3bd7)
Reviewed-on: https://gerrit.libreoffice.org/32376
Tested-by: Jenkins 
Reviewed-by: Maxim Monastirsky 

diff --git a/framework/source/uielement/menubarmanager.cxx 
b/framework/source/uielement/menubarmanager.cxx
index 530df3e..0a50c02 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -1172,11 +1172,6 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const 
Reference< XFrame >& rF
 {
 sal_uInt16 nItemId = FillItemCommand(aItemCommand,pMenu, i );
 
-// Command can be just an alias to another command.
-OUString aRealCommand = 
vcl::CommandInfoProvider::Instance().GetRealCommandForCommand( aItemCommand, 
m_xFrame );
-if ( !aRealCommand.isEmpty() )
-aItemCommand = aRealCommand;
-
 // Set module identifier when provided from outside
 if ( !rModuleIdentifier.isEmpty() )
 {
@@ -1191,6 +1186,11 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const 
Reference< XFrame >& rF
 pMenu->SetItemText( nItemId, RetrieveLabelFromCommand( 
aItemCommand ));
 }
 
+// Command can be just an alias to another command.
+OUString aRealCommand = 
vcl::CommandInfoProvider::Instance().GetRealCommandForCommand( aItemCommand, 
m_xFrame );
+if ( !aRealCommand.isEmpty() )
+aItemCommand = aRealCommand;
+
 Reference< XDispatch > xDispatch;
 Reference< XStatusListener > xStatusListener;
 VclPtr pPopup = pMenu->GetPopupMenu( nItemId );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sal/CppunitTest_sal_bytesequence.mk sal/CppunitTest_sal_rtl_alloc.mk sal/CppunitTest_sal_rtl_bootstrap.mk sal/CppunitTest_sal_rtl_cipher.mk sal/CppunitTest_sal_rtl_crc3

[Matúš Kukan]

 sal/CppunitTest_sal_bytesequence.mk|   22 ---
 sal/CppunitTest_sal_rtl.mk |   67 
++
 sal/CppunitTest_sal_rtl_alloc.mk   |   22 ---
 sal/CppunitTest_sal_rtl_bootstrap.mk   |   21 ---
 sal/CppunitTest_sal_rtl_cipher.mk  |   22 ---
 sal/CppunitTest_sal_rtl_crc32.mk   |   22 ---
 sal/CppunitTest_sal_rtl_digest.mk  |   24 ---
 sal/CppunitTest_sal_rtl_doublelock.mk  |   22 ---
 sal/CppunitTest_sal_rtl_locale.mk  |   22 ---
 sal/CppunitTest_sal_rtl_math.mk|   21 ---
 sal/CppunitTest_sal_rtl_ostringbuffer.mk   |   22 ---
 sal/CppunitTest_sal_rtl_oustring.mk|   30 
 sal/CppunitTest_sal_rtl_oustringbuffer.mk  |   26 ---
 sal/CppunitTest_sal_rtl_process.mk |   22 ---
 sal/CppunitTest_sal_rtl_random.mk  |   21 ---
 sal/CppunitTest_sal_rtl_ref.mk |   21 ---
 sal/CppunitTest_sal_rtl_strings.mk |   38 -
 sal/CppunitTest_sal_rtl_textenc.mk |   26 ---
 sal/CppunitTest_sal_rtl_uri.mk |   32 
 sal/CppunitTest_sal_rtl_uuid.mk|   27 
 sal/Module_sal.mk  |   20 --
 sal/qa/ByteSequence/ByteSequence.cxx   |2 
 sal/qa/OStringBuffer/rtl_OStringBuffer.cxx |2 
 sal/qa/rtl/bootstrap/expand.cxx|2 
 sal/qa/rtl/cipher/rtl_cipher.cxx   |4 
 sal/qa/rtl/crc32/rtl_crc32.cxx |4 
 sal/qa/rtl/digest/rtl_digest.cxx   |2 
 sal/qa/rtl/doublelock/rtl_doublelocking.cxx|4 
 sal/qa/rtl/locale/rtl_locale.cxx   |6 
 sal/qa/rtl/math/test-rtl-math.cxx  |2 
 sal/qa/rtl/oustring/rtl_OUString2.cxx  |4 
 sal/qa/rtl/oustringbuffer/test_oustringbuffer_noadditional.cxx |   25 ---
 sal/qa/rtl/process/rtl_Process.cxx |4 
 sal/qa/rtl/random/rtl_random.cxx   |2 
 sal/qa/rtl/ref/rtl_ref.cxx |1 
 sal/qa/rtl/strings/test_oustring_noadditional.cxx  |   25 ---
 sal/qa/rtl/textenc/rtl_tencinfo.cxx|3 
 sal/qa/rtl/uri/rtl_Uri.cxx |4 
 sal/qa/rtl/uri/rtl_testuri.cxx |1 
 sal/qa/rtl/uuid/rtl_Uuid.cxx   |4 
 40 files changed, 68 insertions(+), 583 deletions(-)

New commits:
commit 597d178c2b516ab0cff4e4f86246d47ce9700f18
Author: Matúš Kukan 
Date:   Sat Dec 17 10:30:36 2016 +0100

tdf#97283: Merge sal rtl tests to one makefile

Change-Id: I1b78276e08feef9b6f49e5abe002391c50a8d2cc
Reviewed-on: https://gerrit.libreoffice.org/32143
Tested-by: Jenkins 
Reviewed-by: Matúš Kukan 

diff --git a/sal/CppunitTest_sal_bytesequence.mk 
b/sal/CppunitTest_sal_bytesequence.mk
deleted file mode 100644
index ca22ebb..000
--- a/sal/CppunitTest_sal_bytesequence.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_CppunitTest_CppunitTest,sal_bytesequence))
-
-$(eval $(call gb_CppunitTest_add_exception_objects,sal_bytesequence,\
-sal/qa/ByteSequence/ByteSequence \
-))
-
-$(eval $(call gb_CppunitTest_use_libraries,sal_bytesequence,\
-sal \
-   $(gb_UWINAPI) \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/sal/CppunitTest_sal_rtl.mk b/sal/CppunitTest_sal_rtl.mk
new file mode 100644
index 000..b69e330
--- /dev/null
+++ b/sal/CppunitTest_sal_rtl.mk
@@ -0,0 +1,67 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_CppunitTest_CppunitTest,sal_rtl))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,sal_rtl,\
+   sal/qa/ByteSequence/ByteSequence \
+   sal/qa/OStringBuffer/rtl_OStringBuffer \
+   sal/qa/rtl/alloc/rtl_alloc \
+   sal/qa/rtl/bootstrap/ex

[Libreoffice-commits] core.git: sal/CppunitTest_sal_osl_condition.mk sal/CppunitTest_sal_osl_file.mk sal/CppunitTest_sal_osl_getsystempathfromfileurl.mk sal/CppunitTest_sal_osl.mk sal/CppunitTest_sal_

[Matúš Kukan]

 sal/CppunitTest_sal_osl.mk|   44 
++
 sal/CppunitTest_sal_osl_condition.mk  |   22 
-
 sal/CppunitTest_sal_osl_file.mk   |   24 
-
 sal/CppunitTest_sal_osl_getsystempathfromfileurl.mk   |   22 
-
 sal/CppunitTest_sal_osl_module.mk |   26 
-
 sal/CppunitTest_sal_osl_mutex.mk  |   21 

 sal/CppunitTest_sal_osl_old_test_file.mk  |   22 
-
 sal/CppunitTest_sal_osl_pipe.mk   |   21 

 sal/CppunitTest_sal_osl_process.mk|   28 
--
 sal/CppunitTest_sal_osl_profile.mk|   21 

 sal/CppunitTest_sal_osl_setthreadname.mk  |   23 
-
 sal/CppunitTest_sal_osl_thread.mk |   22 
-
 sal/CppunitTest_sal_tcwf.mk   |   23 
-
 sal/Module_sal.mk |   15 
---
 sal/qa/osl/file/osl_File.cxx  |2 
 sal/qa/osl/file/osl_old_test_file.cxx |2 
 sal/qa/osl/file/test_cpy_wrt_file.cxx |6 -
 sal/qa/osl/getsystempathfromfileurl/test-getsystempathfromfileurl.cxx |2 
 sal/qa/osl/module/osl_Module.cxx  |4 
 sal/qa/osl/mutex/osl_Mutex.cxx|2 
 sal/qa/osl/pipe/osl_Pipe.cxx  |2 
 sal/qa/osl/process/osl_Thread.cxx |4 
 sal/qa/osl/process/osl_process.cxx|2 
 sal/qa/osl/profile/osl_old_testprofile.cxx|2 
 sal/qa/osl/setthreadname/test-setthreadname.cxx   |2 
 25 files changed, 46 insertions(+), 318 deletions(-)

New commits:
commit 8e743e46781b252f41227d809dec43d3c4c1d01f
Author: Matúš Kukan 
Date:   Sat Dec 17 08:58:42 2016 +0100

tdf#97283: Merge sal osl tests to one makefile

Leave sal_osl_security alone because
it does not use CPPUNIT_PLUGIN_IMPLEMENT.

Change-Id: Iced8bb80c3ae661d371c087d7178a373ffd802e0
Reviewed-on: https://gerrit.libreoffice.org/32142
Tested-by: Jenkins 
Reviewed-by: Matúš Kukan 

diff --git a/sal/CppunitTest_sal_osl.mk b/sal/CppunitTest_sal_osl.mk
new file mode 100644
index 000..7432ff9
--- /dev/null
+++ b/sal/CppunitTest_sal_osl.mk
@@ -0,0 +1,44 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_CppunitTest_CppunitTest,sal_osl))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,sal_osl,\
+   sal/qa/osl/condition/osl_Condition \
+   $(if $(filter $(OS),WNT),,sal/qa/osl/file/osl_File) \
+   sal/qa/osl/file/osl_old_test_file \
+   sal/qa/osl/file/test_cpy_wrt_file \
+   sal/qa/osl/getsystempathfromfileurl/test-getsystempathfromfileurl \
+   $(if $(DISABLE_DYNLOADING),,sal/qa/osl/module/osl_Module) \
+   sal/qa/osl/mutex/osl_Mutex \
+   sal/qa/osl/pipe/osl_Pipe \
+   sal/qa/osl/process/osl_process \
+   sal/qa/osl/process/osl_Thread \
+   sal/qa/osl/profile/osl_old_testprofile \
+   sal/qa/osl/setthreadname/test-setthreadname \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,sal_osl,\
+   sal \
+   $(gb_UWINAPI) \
+))
+
+# the test uses the library created by Module_DLL
+$(call gb_CppunitTest_get_target,sal_osl) : \
+   $(call gb_CppunitTest_get_target,Module_DLL)
+
+$(eval $(call gb_CppunitTest_use_executable,sal_osl,osl_process_child))
+
+$(eval $(call gb_CppunitTest_use_externals,sal_osl,\
+   boost_headers \
+   valgrind \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sal/CppunitTest_sal_osl_condition.mk 
b/sal/CppunitTest_sal_osl_condition.mk
deleted file mode 100644
index 4b9f4aa..000
--- a/sal/CppunitTest_sal_osl_condition.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_CppunitTest_CppunitTest,sal_osl_condition))
-
-$(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_condition,\
-sal/qa/osl/condition/osl_Condition \
-))
-
-$(eval $(call gb_CppunitTest_us

[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - connectivity/source

[Julien Nabet]

 connectivity/source/drivers/firebird/PreparedStatement.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 42056f71c1dc5f291ad7b35b637b5bf354f99e91
Author: Julien Nabet 
Date:   Fri Dec 23 10:47:46 2016 +0100

tdf#104858: fix typo

Thank you to himajin100...@gmail.com for having noticed this.

Change-Id: I81da0d4fc91faf95f4f5257d5834a9fdfd2618f7
(cherry picked from commit dbc3cfb011f3bbbc0d95acc362dc7aa5bca6e831)
Reviewed-on: https://gerrit.libreoffice.org/32379
Reviewed-by: Julien Nabet 
Tested-by: Julien Nabet 

diff --git a/connectivity/source/drivers/firebird/PreparedStatement.cxx 
b/connectivity/source/drivers/firebird/PreparedStatement.cxx
index 7af0976..8d50daa 100644
--- a/connectivity/source/drivers/firebird/PreparedStatement.cxx
+++ b/connectivity/source/drivers/firebird/PreparedStatement.cxx
@@ -378,7 +378,7 @@ void OPreparedStatement::setValue(sal_Int32 nIndex, T& 
nValue, ISC_SHORT nType)
 if ((pVar->sqltype & ~1) != nType)
 {
::dbtools::throwSQLException(
-"Incorrect type for setString",
+"Incorrect type for setValue",
 ::dbtools::StandardSQLState::INVALID_SQL_DATA_TYPE,
 *this);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Julien Nabet]

 connectivity/source/drivers/firebird/PreparedStatement.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit dbc3cfb011f3bbbc0d95acc362dc7aa5bca6e831
Author: Julien Nabet 
Date:   Fri Dec 23 10:47:46 2016 +0100

tdf#104858: fix typo

Thank you to himajin100...@gmail.com for having noticed this.

Change-Id: I81da0d4fc91faf95f4f5257d5834a9fdfd2618f7
Reviewed-on: https://gerrit.libreoffice.org/32378
Reviewed-by: Julien Nabet 
Tested-by: Julien Nabet 

diff --git a/connectivity/source/drivers/firebird/PreparedStatement.cxx 
b/connectivity/source/drivers/firebird/PreparedStatement.cxx
index 7af5203..b427c5f 100644
--- a/connectivity/source/drivers/firebird/PreparedStatement.cxx
+++ b/connectivity/source/drivers/firebird/PreparedStatement.cxx
@@ -377,7 +377,7 @@ void OPreparedStatement::setValue(sal_Int32 nIndex, T& 
nValue, ISC_SHORT nType)
 if ((pVar->sqltype & ~1) != nType)
 {
::dbtools::throwSQLException(
-"Incorrect type for setString",
+"Incorrect type for setValue",
 ::dbtools::StandardSQLState::INVALID_SQL_DATA_TYPE,
 *this);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: wsd/Storage.cpp

[Pranav Kant]

 wsd/Storage.cpp |  165 +++-
 1 file changed, 94 insertions(+), 71 deletions(-)

New commits:
commit ad373c879b85ae4eb684aa88b4a884467e90
Author: Pranav Kant 
Date:   Fri Dec 23 13:23:50 2016 +0530

storage: catch exceptions explicitly when interacting with WOPI host

... and print error in the logs. So that if there is some problem
in the setup and we are not able to interact with WOPI host for some
reason, we print it in the error logs clearly.

Convert to new style logging - LOG_XXX macros.

Change-Id: I53ce4f61136ffd256b0eae8712dc7f22a620e2bf

diff --git a/wsd/Storage.cpp b/wsd/Storage.cpp
index 7734ee5..33790b1 100644
--- a/wsd/Storage.cpp
+++ b/wsd/Storage.cpp
@@ -357,27 +357,40 @@ void getWOPIValue(const Poco::JSON::Object::Ptr &object, 
const std::string& key,
 
 std::unique_ptr WopiStorage::getWOPIFileInfo(const 
Poco::URI& uriPublic)
 {
-Log::debug("Getting info for wopi uri [" + uriPublic.toString() + "].");
+LOG_DBG("Getting info for wopi uri [" + uriPublic.toString() + "].");
 
+std::string resMsg;
 const auto startTime = std::chrono::steady_clock::now();
-std::unique_ptr 
psession(getHTTPClientSession(uriPublic));
+std::chrono::duration callDuration(0);
+try
+{
+std::unique_ptr 
psession(getHTTPClientSession(uriPublic));
+
+Poco::Net::HTTPRequest request(Poco::Net::HTTPRequest::HTTP_GET, 
uriPublic.getPathAndQuery(), Poco::Net::HTTPMessage::HTTP_1_1);
+request.set("User-Agent", "LOOLWSD WOPI Agent");
+psession->sendRequest(request);
 
-Poco::Net::HTTPRequest request(Poco::Net::HTTPRequest::HTTP_GET, 
uriPublic.getPathAndQuery(), Poco::Net::HTTPMessage::HTTP_1_1);
-request.set("User-Agent", "LOOLWSD WOPI Agent");
-psession->sendRequest(request);
+Poco::Net::HTTPResponse response;
+std::istream& rs = psession->receiveResponse(response);
+callDuration = (std::chrono::steady_clock::now() - startTime);
 
-Poco::Net::HTTPResponse response;
+auto logger = Log::trace();
+logger << "WOPI::CheckFileInfo header for URI [" << 
uriPublic.toString() << "]:\n";
+for (auto& pair : response)
+{
+logger << '\t' + pair.first + ": " + pair.second << " / ";
+}
+logger << Log::end;
 
-std::istream& rs = psession->receiveResponse(response);
-auto logger = Log::trace();
-logger << "WOPI::CheckFileInfo header for URI [" << uriPublic.toString() 
<< "]:\n";
-for (auto& pair : response)
+Poco::StreamCopier::copyToString(rs, resMsg);
+}
+catch(const Poco::Exception& pexc)
 {
-logger << '\t' + pair.first + ": " + pair.second << " / ";
+LOG_ERR("Cannot get file info from WOPI storage uri [" + 
uriPublic.toString() + "]. Error: " << pexc.displayText() <<
+(pexc.nested() ? " (" + pexc.nested()->displayText() + ")" : 
""));
+throw;
 }
 
-logger << Log::end;
-
 // Parse the response.
 std::string filename;
 size_t size = 0;
@@ -394,12 +407,8 @@ std::unique_ptr 
WopiStorage::getWOPIFileInfo(const Po
 bool disableExport = false;
 bool disableCopy = false;
 std::string lastModifiedTime;
-std::string resMsg;
-Poco::StreamCopier::copyToString(rs, resMsg);
 
-const auto endTime = std::chrono::steady_clock::now();
-const std::chrono::duration callDuration = (endTime - startTime);
-Log::debug("WOPI::CheckFileInfo returned: " + resMsg + ". Call duration: " 
+ std::to_string(callDuration.count()) + "s");
+LOG_DBG("WOPI::CheckFileInfo returned: " + resMsg + ". Call duration: " + 
std::to_string(callDuration.count()) + "s");
 const auto index = resMsg.find_first_of('{');
 if (index != std::string::npos)
 {
@@ -424,7 +433,7 @@ std::unique_ptr 
WopiStorage::getWOPIFileInfo(const Po
 getWOPIValue(object, "LastModifiedTime", lastModifiedTime);
 }
 else
-Log::error("WOPI::CheckFileInfo is missing JSON payload");
+LOG_ERR("WOPI::CheckFileInfo is missing JSON payload");
 
 Poco::Timestamp modifiedTime = Poco::Timestamp::fromEpochTime(0);
 if (lastModifiedTime != "")
@@ -457,39 +466,46 @@ std::string WopiStorage::loadStorageFileToLocal()
 // Add it here to get the payload instead of file info.
 Poco::URI uriObject(_uri);
 uriObject.setPath(uriObject.getPath() + "/contents");
-Log::debug("Wopi requesting: " + uriObject.toString());
+LOG_DBG("Wopi requesting: " + uriObject.toString());
 
 const auto startTime = std::chrono::steady_clock::now();
-std::unique_ptr 
psession(getHTTPClientSession(uriObject));
+try
+{
+std::unique_ptr 
psession(getHTTPClientSession(uriObject));
 
-Poco::Net::HTTPRequest request(Poco::Net::HTTPRequest::HTTP_GET, 
uriObject.getPathAndQuery(), Poco::Net::HTTPMessage::HTTP_1_1);
-request.set("User-Agent", "LOOLWSD WOPI Agent");
-psession-

[Libreoffice-commits] help.git: source/text

[Gabor Kelemen]

 source/text/shared/01/0521.xhp |8 +---
 source/text/shared/01/05210100.xhp |   62 +++--
 2 files changed, 34 insertions(+), 36 deletions(-)

New commits:
commit 447e7d65d59935724657e59b7f9f8bf312c6dce8
Author: Gabor Kelemen 
Date:   Tue Dec 20 01:12:57 2016 +0100

Update Area tab page and Area dialog help pages

- Add distinctive titles
- Remove embeds from the Area dialogs page to subpages now on the tab
- Update text and UI connections on the Area tabpage
  Add links to subpages
- Still left: move out help text of .uno:FillStyle

Change-Id: If6561f0d348997263ad71170ef58691e751605a3
Reviewed-on: https://gerrit.libreoffice.org/32263
Reviewed-by: Gabor Kelemen 
Tested-by: Gabor Kelemen 

diff --git a/source/text/shared/01/0521.xhp 
b/source/text/shared/01/0521.xhp
index 09f9246..895d85f 100644
--- a/source/text/shared/01/0521.xhp
+++ b/source/text/shared/01/0521.xhp
@@ -22,7 +22,7 @@
 
 
 
-Area
+Area window
 /text/shared/01/0521.xhp
 
 
@@ -31,7 +31,7 @@
 
 
 
-
+
 
 Area
 
@@ -44,10 +44,6 @@
 
 
 
-
-
-
-
 
 
 
diff --git a/source/text/shared/01/05210100.xhp 
b/source/text/shared/01/05210100.xhp
index 6f20ad4..a114440 100644
--- a/source/text/shared/01/05210100.xhp
+++ b/source/text/shared/01/05210100.xhp
@@ -24,7 +24,7 @@
 
 
 
-Area
+Area tab
 /text/shared/01/05210100.xhp
 
 
@@ -38,42 +38,44 @@
 
 Area
 Set the fill options for 
the selected drawing object.
+This is not only for drawing objects, but pages, paragraphs and 
others too. Need better wording
 
-You can save collections of colors, gradients, hatchings, and 
bitmap patterns as lists that you can later load and use.
+You can add custom colors, gradients, hatchings, two color patterns 
and bitmap patterns to the default lists for later use.
 
   
 
-Fill
 
+
+None
+Do not fill the selected 
object.
+
+
+Color
+Fills the object with a 
color selected on this page.
+
+
+Gradient
+Fills the object with a 
gradient selected on this page.
+
+
+Bitmap
+Fills the object with a 
bitmap pattern selected on this page. To add a bitmap to the list, open 
this dialog, click the Bitmaps tab, and then click Add / 
Import.
+
+TODO: write a page about the Pattern tab
+
+Pattern
+Fills the object with a 
simple two color pattern selected on this page.
+
+
+Hatch
+Fills the object with a 
hatching pattern selected on this page. To apply a background color to 
the hatching pattern, select the Background color box, and then 
click a color in the list.
+
+You can quickly select fill options from the list boxes on the 
Drawing Object Properties toolbar.
+
+
+TODO: This para doesn't belong here anymore, but as several places 
include it, can't remove yet. Find a better place for it in a later 
commit.
 
-
 Select the type of 
fill that you want to apply to the selected drawing object.
 
-List boxes on the Drawing Object Properties 
toolbar:
-
-None
-Color
-Fills the selected object 
with the color that you click in the list.
-
-
-To add a color to the list, choose Format - 
Area, click the Colors tab, and then click 
Edit.
-
-
-To add a 
color to the list, choose Format - Area, click the 
Colors tab, and then click Edit.
-
-
-Gradient
-Fills the selected 
object with the gradient that you click in the list.
-Hatching
-Fills the selected 
object with the hatching pattern that you click in the list. To apply a 
background color to the hatching pattern, select the Background 
color box, and then click a color in the list.
-Bitmap
-Fills the selected object 
with the bitmap pattern that you click in the list. To add a bitmap to the 
list, open this dialog in %PRODUCTNAME Draw, click the Bitmaps 
tab, and then click Import.
-
-
-
-
-Area Fill
-Click the fill that you 
want to apply to the selected object.
-
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Gabor Kelemen]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9fd4a1d37cd89c11a9683a74504b41f4c7ad5a13
Author: Gabor Kelemen 
Date:   Tue Dec 20 01:12:57 2016 +0100

Updated core
Project: help  447e7d65d59935724657e59b7f9f8bf312c6dce8

Update Area tab page and Area dialog help pages

- Add distinctive titles
- Remove embeds from the Area dialogs page to subpages now on the tab
- Update text and UI connections on the Area tabpage
  Add links to subpages
- Still left: move out help text of .uno:FillStyle

Change-Id: If6561f0d348997263ad71170ef58691e751605a3
Reviewed-on: https://gerrit.libreoffice.org/32263
Reviewed-by: Gabor Kelemen 
Tested-by: Gabor Kelemen 

diff --git a/helpcontent2 b/helpcontent2
index 7027498..447e7d6 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 70274981c0428b95e2868660f7b8d387048ef2ba
+Subproject commit 447e7d65d59935724657e59b7f9f8bf312c6dce8
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: source/text

[Gabor Kelemen]

 source/text/scalc/01/06060100.xhp|6 +++---
 source/text/scalc/guide/cell_protect.xhp |2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 70274981c0428b95e2868660f7b8d387048ef2ba
Author: Gabor Kelemen 
Date:   Fri Dec 23 00:54:55 2016 +0100

tdf#60873 Link Protect Sheet dialog to its own help page

Instead of Protecting Cells from Changes.
Create a link to the Password page too.
TODO: Update formatting of all those tips, they look terrible

Change-Id: I345bcfd315680b5ad4fdf71dcc04085ef438ad13
Reviewed-on: https://gerrit.libreoffice.org/32360
Reviewed-by: Gabor Kelemen 
Tested-by: Gabor Kelemen 

diff --git a/source/text/scalc/01/06060100.xhp 
b/source/text/scalc/01/06060100.xhp
index 3faac0a..2905f06 100644
--- a/source/text/scalc/01/06060100.xhp
+++ b/source/text/scalc/01/06060100.xhp
@@ -27,7 +27,7 @@
 
 
 
-
+
 
 Protecting Sheet
 Protects the cells in the current 
sheet from being modified. Choose Tools - Protect 
Sheet to open the Protect Sheet dialog in which you then 
specify sheet protection with or without a password.
@@ -44,8 +44,8 @@
 If a sheet is protected, you will not be able to modify or delete 
any Cell Styles.
 A protected 
sheet or cell range can no longer be modified until this protection is 
disabled. To disable the protection, choose the Tools - Protect 
Sheet command. If no password was set, the sheet protection is 
immediately disabled. If the sheet was password protected, the Remove 
Protection dialog opens, where you must enter the password.
 Once saved, protected sheets can only be saved again by using the 
File - Save As command.
-Password (optional)
-Allows you to enter a password to protect 
the sheet from unauthorized changes.
+Password (optional)
+Allows you 
to enter a password to protect the sheet from unauthorized 
changes.
 Complete protection 
of your work can be achieved by combining the options Tools - Protect 
Sheet and Tools - Protect Spreadsheet, including password 
protection. To prohibit opening the document altogether, in the 
Save dialog mark the Save with password box before 
you click the Save button.
 
 
diff --git a/source/text/scalc/guide/cell_protect.xhp 
b/source/text/scalc/guide/cell_protect.xhp
index 8ffa1fe..aa8d5fb 100644
--- a/source/text/scalc/guide/cell_protect.xhp
+++ b/source/text/scalc/guide/cell_protect.xhp
@@ -37,7 +37,7 @@
   hiding;formulas
   formulas;hiding
 
-
+
 Protecting Cells from Changes
 
   In %PRODUCTNAME Calc you can 
protect sheets and the document as a whole. You can choose whether the cells 
are protected against accidental changes, whether the formulas can be viewed 
from within Calc, whether the cells are visible or whether the cells can be 
printed.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Gabor Kelemen]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9606d112495e25782fa0e7b37d1309fe95740ece
Author: Gabor Kelemen 
Date:   Fri Dec 23 00:54:55 2016 +0100

Updated core
Project: help  70274981c0428b95e2868660f7b8d387048ef2ba

tdf#60873 Link Protect Sheet dialog to its own help page

Instead of Protecting Cells from Changes.
Create a link to the Password page too.
TODO: Update formatting of all those tips, they look terrible

Change-Id: I345bcfd315680b5ad4fdf71dcc04085ef438ad13
Reviewed-on: https://gerrit.libreoffice.org/32360
Reviewed-by: Gabor Kelemen 
Tested-by: Gabor Kelemen 

diff --git a/helpcontent2 b/helpcontent2
index f7d6c59..7027498 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit f7d6c59b0ef6b01ea2d4b155d071f6b3617cd15f
+Subproject commit 70274981c0428b95e2868660f7b8d387048ef2ba
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: 2 commits - source/text

[Gabor Kelemen]

 source/text/scalc/01/0510.xhp|   10 +-
 source/text/shared/01/0613.xhp   |   22 +++---
 source/text/shared/01/gallery.xhp|   10 +-
 source/text/simpress/01/0510.xhp |8 
 source/text/swriter/01/0514.xhp  |4 ++--
 5 files changed, 27 insertions(+), 27 deletions(-)

New commits:
commit f7d6c59b0ef6b01ea2d4b155d071f6b3617cd15f
Author: Gabor Kelemen 
Date:   Thu Dec 22 22:01:32 2016 +0100

Fix ahelp hids in the Gallery and Styles and Formatting sidebars

Change-Id: I1449abab18c98ffc8b200cdb1ee29ab6a56df33c
Reviewed-on: https://gerrit.libreoffice.org/32355
Reviewed-by: Gabor Kelemen 
Tested-by: Gabor Kelemen 

diff --git a/source/text/scalc/01/0510.xhp 
b/source/text/scalc/01/0510.xhp
index 7ce51e5..8fb10f1 100644
--- a/source/text/scalc/01/0510.xhp
+++ b/source/text/scalc/01/0510.xhp
@@ -92,7 +92,7 @@
 
 
 Fill 
Format Mode
-Turns the Fill Format mode on and off. Use the 
paint can to assign the Style selected in the Styles and Formatting 
window.
+Turns the Fill Format mode on and off. Use the 
paint can to assign the Style selected in the Styles and Formatting 
window.
 
 
   
@@ -125,7 +125,7 @@
 
 
 New 
Style from Selection
-Creates a new style based on the formatting of 
a selected object. Assign a name for the style in the Create Style 
dialog.
+Creates a new style based on the 
formatting of a selected object. Assign a name for the style in the 
Create 
Style dialog.
 
 
   
@@ -141,7 +141,7 @@
 
 
 Update 
Style
-Updates the Style selected in the Styles and 
Formatting window with the current formatting of the selected 
object.
+Updates the Style selected in the 
Styles and Formatting window with the current formatting of the selected 
object.
 
 
   
@@ -157,12 +157,12 @@
 
 
 Style 
List
-Displays the list of the styles from the selected style 
category.
+Displays the list of the styles from the selected 
style category.
 In the context 
menu you can choose commands to create a new style, delete a 
user-defined style, or change the selected style.
 
 
 Style 
GroupsUFI: use "groups" to be consistent with 
Writer
-Lists the available style groups.
+Lists the available style 
groups.
 
 
 
diff --git a/source/text/shared/01/gallery.xhp 
b/source/text/shared/01/gallery.xhp
index 913417e..1c85f09 100644
--- a/source/text/shared/01/gallery.xhp
+++ b/source/text/shared/01/gallery.xhp
@@ -28,9 +28,9 @@
 
 
 
-Displays the contents of the 
Gallery as icons.
+Displays the contents of the Gallery 
as icons.
 
-Displays the contents of the 
Gallery as small icons, with title and path 
information.
+Displays the contents of the Gallery 
as small icons, with title and path information.
 
 
 
@@ -48,9 +48,9 @@
 
 
 
-Themes are 
listed on the left side of the Gallery.Click a theme to view the objects associated with 
the theme.
+Themes are 
listed on the left side of the Gallery.Click a theme to view the objects associated 
with the theme.
 
-To insert a Gallery object, select the 
object, and then drag it into the document.
+To insert a Gallery object, select 
the object, and then drag it into the document.
 
 
 
@@ -60,7 +60,7 @@
 
 
 New 
theme
-Adds a new theme to the Gallery and 
lets you choose the files to include in the theme.
+Adds a new theme to the Gallery and 
lets you choose the files to include in the theme.
 To access the 
following commands, right-click a theme in the Gallery:
 
 
diff --git a/source/text/simpress/01/0510.xhp 
b/source/text/simpress/01/0510.xhp
index c04e403..00a939d 100644
--- a/source/text/simpress/01/0510.xhp
+++ b/source/text/simpress/01/0510.xhp
@@ -82,7 +82,7 @@
 
 
 Fill 
format mode
-Applies the selected style to an object on your 
slide. Click the paint bucket icon and then click an object in your slide to 
apply the style. Click the paint bucket icon again to exit this 
mode.
+Applies the selected style to an object on 
your slide. Click the paint bucket icon and then click an object in your slide 
to apply the style. Click the paint bucket icon again to exit this 
mode.
 
 
   
@@ -98,7 +98,7 @@
 
 
 New 
Style from Selection
-Creates a new style using the format 
attributes of a selected object.
+Creates a new style using the format 
attributes of a selected object.
 
 
   
@@ -114,7 +114,7 @@
 
 
 Update 
Style
-Updates the Style selected in the Styles and 
Formatting window with the current formatting of the selected 
object.
+Updates the Style selected in the 
Styles and Formatting window with the current formatting of the selected 
object.
 
 
   
@@ -130,7 +130,7 @@
 
 
 Style 
List / Style Groups / Context menu: New / Modify / Delete
-Create, edit, apply and manage 
styles.
+Create, edit, apply and manage 
styles.
 
 
 
diff --git a/source/text/swriter/01/0514.xhp 
b/source/text/swriter/01/0514.xhp
index 06a70db..12f0e4c 100644
--- a/source/text/swriter/01/0514.xhp
+++ b/source/text/swriter/01/0514.xhp
@@ -142,7 +142,7 @@

[Libreoffice-commits] core.git: 2 commits - helpcontent2

[Gabor Kelemen]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7ba2d4da7b48a1eab03717069a53ece0263f5da0
Author: Gabor Kelemen 
Date:   Thu Dec 22 22:01:32 2016 +0100

Updated core
Project: help  f7d6c59b0ef6b01ea2d4b155d071f6b3617cd15f

Fix ahelp hids in the Gallery and Styles and Formatting sidebars

Change-Id: I1449abab18c98ffc8b200cdb1ee29ab6a56df33c
Reviewed-on: https://gerrit.libreoffice.org/32355
Reviewed-by: Gabor Kelemen 
Tested-by: Gabor Kelemen 

diff --git a/helpcontent2 b/helpcontent2
index f71f2e4..f7d6c59 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit f71f2e44e8dbd9b026755152568e7c0f32f47fe9
+Subproject commit f7d6c59b0ef6b01ea2d4b155d071f6b3617cd15f
commit ae5113197e55dc992bdc2dbbbdff13d9a6970689
Author: Gabor Kelemen 
Date:   Thu Dec 22 00:47:11 2016 +0100

Updated core
Project: help  f71f2e44e8dbd9b026755152568e7c0f32f47fe9

tdf#76488 (partial) Reconnect the script organizer dialog and UI

Change-Id: I96a6cb57f47dca1b91b8d107adf0c34bd77845b0
Reviewed-on: https://gerrit.libreoffice.org/32317
Reviewed-by: Gabor Kelemen 
Tested-by: Gabor Kelemen 

diff --git a/helpcontent2 b/helpcontent2
index 4736be4..f71f2e4 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 4736be43b377d0493ee0327f605a8551eca0d647
+Subproject commit f71f2e44e8dbd9b026755152568e7c0f32f47fe9
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Mike Kaganski]

 vcl/source/window/winproc.cxx |   11 +--
 1 file changed, 5 insertions(+), 6 deletions(-)

New commits:
commit 9d80d0199a0257124dd66e742766eff38087484d
Author: Mike Kaganski 
Date:   Fri Dec 23 10:55:07 2016 +0300

ImplHandliKey: remove redundant NotifyEvents

Change-Id: I7c53b3428d035c36c0f83317b8f9185192ac001a
Reviewed-on: https://gerrit.libreoffice.org/32372
Tested-by: Jenkins 
Reviewed-by: Mike Kaganski 

diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index effc5bb..210daa7 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -859,7 +859,6 @@ static bool ImplHandleKey( vcl::Window* pWindow, 
MouseNotifyEvent nSVEvent,
 // allow application key listeners to remove the key event
 // but make sure we're not forwarding external KeyEvents, (ie where 
bForward is false)
 // because those are coming back from the listener itself and MUST be 
processed
-KeyEvent aKeyEvent( (sal_Unicode)nCharCode, aKeyCode, nRepeat );
 if( bForward )
 {
 VclEventId nVCLEvent;
@@ -875,7 +874,8 @@ static bool ImplHandleKey( vcl::Window* pWindow, 
MouseNotifyEvent nSVEvent,
 nVCLEvent = VclEventId::NONE;
 break;
 }
-if( nVCLEvent != VclEventId::NONE && Application::HandleKey( 
nVCLEvent, pWindow, &aKeyEvent ) )
+KeyEvent aKeyEvent((sal_Unicode)nCharCode, aKeyCode, nRepeat);
+if (nVCLEvent != VclEventId::NONE && Application::HandleKey(nVCLEvent, 
pWindow, &aKeyEvent))
 return true;
 }
 
@@ -1088,8 +1088,7 @@ static bool ImplHandleKey( vcl::Window* pWindow, 
MouseNotifyEvent nSVEvent,
 pChild = pWindow->GetParent();
 
 // call handler
-KeyEventaKEvt( (sal_Unicode)nCharCode, aKeyCode, nRepeat );
-NotifyEvent aNEvt( nSVEvent, pChild, &aKEvt );
+NotifyEvent aNEvt( nSVEvent, pChild, &aKeyEvt );
 bool bPreNotify = ImplCallPreNotify( aNEvt );
 if ( pChild->IsDisposed() )
 return true;
@@ -1099,12 +1098,12 @@ static bool ImplHandleKey( vcl::Window* pWindow, 
MouseNotifyEvent nSVEvent,
 if ( nSVEvent == MouseNotifyEvent::KEYINPUT )
 {
 pChild->ImplGetWindowImpl()->mbKeyInput = false;
-pChild->KeyInput( aKEvt );
+pChild->KeyInput( aKeyEvt );
 }
 else
 {
 pChild->ImplGetWindowImpl()->mbKeyUp = false;
-pChild->KeyUp( aKEvt );
+pChild->KeyUp( aKeyEvt );
 }
 
 if( !pChild->IsDisposed() )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits