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

[Tomofumi Yagi (via logerrit)]

 sc/source/ui/dbgui/tpsubt.cxx   |   64 +---
 sc/source/ui/inc/tpsubt.hxx |2 +
 sc/uiconfig/scalc/ui/subtotalgrppage.ui |   14 +++
 3 files changed, 66 insertions(+), 14 deletions(-)

New commits:
commit e0c1fdcab23dbd2b7a0a7227557d7afc41b49bd7
Author: Tomofumi Yagi 
AuthorDate: Sat Oct 10 14:54:30 2020 +0900
Commit: Noel Grandin 
CommitDate: Sun Oct 11 11:45:35 2020 +0200

tdf#133886 - Libreoffice Calc Subtotals check all columns at once

"Select all columns" checkbox is added to the subtotal group page.

Change-Id: Iee5be3218ecb6d74c7c65b2bf49febf0703ebf35
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104135
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/sc/source/ui/dbgui/tpsubt.cxx b/sc/source/ui/dbgui/tpsubt.cxx
index 30133dce08ad..953c4cf50ff3 100644
--- a/sc/source/ui/dbgui/tpsubt.cxx
+++ b/sc/source/ui/dbgui/tpsubt.cxx
@@ -49,6 +49,7 @@ ScTpSubTotalGroup::ScTpSubTotalGroup(weld::Container* pPage, 
weld::DialogControl
 , mxLbGroup(m_xBuilder->weld_combo_box("group_by"))
 , mxLbColumns(m_xBuilder->weld_tree_view("columns"))
 , mxLbFunctions(m_xBuilder->weld_tree_view("functions"))
+, 
mxLbSelectAllColumns(m_xBuilder->weld_check_button("select_all_columns_button"))
 {
 for (size_t i = 0; i < SAL_N_ELEMENTS(SCSTR_SUBTOTALS); ++i)
 mxLbFunctions->append_text(ScResId(SCSTR_SUBTOTALS[i]));
@@ -80,11 +81,28 @@ void ScTpSubTotalGroup::Init()
 mxLbColumns->connect_changed( LINK( this, ScTpSubTotalGroup, 
SelectTreeListBoxHdl ) );
 mxLbColumns->connect_toggled( LINK( this, ScTpSubTotalGroup, CheckHdl ) );
 mxLbFunctions->connect_changed( LINK( this, ScTpSubTotalGroup, 
SelectTreeListBoxHdl) );
+mxLbSelectAllColumns->connect_clicked( LINK( this, ScTpSubTotalGroup, 
CheckBoxHdl ) );
 
 nFieldArr[0] = 0;
 FillListBoxes();
 }
 
+namespace
+{
+int GetCheckedEntryCount(weld::TreeView& rTreeView)
+{
+int nRet = 0;
+
+rTreeView.all_foreach([&](const weld::TreeIter& rEntry) {
+if ( rTreeView.get_toggle(rEntry) == TRISTATE_TRUE )
+++nRet;
+return false;
+});
+
+return nRet;
+}
+}
+
 bool ScTpSubTotalGroup::DoReset( sal_uInt16 nGroupNo,
  const SfxItemSet&  rArgSet  )
 {
@@ -139,21 +157,12 @@ bool ScTpSubTotalGroup::DoReset( sal_uInt16 
nGroupNo,
 mxLbFunctions->select( 0 );
 }
 
-return true;
-}
+if ( mxLbColumns->n_children() == GetCheckedEntryCount(*mxLbColumns) )
+mxLbSelectAllColumns->set_active( true );
+else
+mxLbSelectAllColumns->set_active( false );
 
-namespace
-{
-int GetCheckedEntryCount(const weld::TreeView& rTreeView)
-{
-int nRet = 0;
-for (sal_Int32 i=0, nEntryCount = rTreeView.n_children(); i < 
nEntryCount; ++i)
-{
-if (rTreeView.get_toggle(i) == TRISTATE_TRUE)
-++nRet;
-}
-return nRet;
-}
+return true;
 }
 
 bool ScTpSubTotalGroup::DoFillItemSet( sal_uInt16   nGroupNo,
@@ -335,6 +344,11 @@ sal_uInt16 ScTpSubTotalGroup::FuncToLbPos( ScSubTotalFunc 
eFunc )
 IMPL_LINK(ScTpSubTotalGroup, SelectTreeListBoxHdl, weld::TreeView&, rLb, void)
 {
 SelectHdl();
+
+if ( mxLbColumns->n_children() == GetCheckedEntryCount(*mxLbColumns) )
+mxLbSelectAllColumns->set_active( true );
+else
+mxLbSelectAllColumns->set_active( false );
 }
 
 IMPL_LINK(ScTpSubTotalGroup, SelectListBoxHdl, weld::ComboBox&, rLb, void)
@@ -366,6 +380,11 @@ IMPL_LINK( ScTpSubTotalGroup, CheckHdl, const 
weld::TreeView::iter_col&, rRowCol
 {
 mxLbColumns->select(rRowCol.first);
 SelectHdl(mxLbColumns.get());
+
+if ( mxLbColumns->n_children() == GetCheckedEntryCount(*mxLbColumns) )
+mxLbSelectAllColumns->set_active( true );
+else
+mxLbSelectAllColumns->set_active( false );
 }
 
 // Derived Group TabPages:
@@ -570,6 +589,23 @@ IMPL_LINK(ScTpSubTotalOptions, CheckHdl, weld::Button&, 
rBox, void)
 }
 }
 
+IMPL_LINK(ScTpSubTotalGroup, CheckBoxHdl, weld::Button&, rBox, void)
+{
+if ( == mxLbSelectAllColumns.get())
+{
+bool bChecked = mxLbSelectAllColumns->get_active();
+
+mxLbColumns->all_foreach([&](const weld::TreeIter& rEntry) {
+if ( bChecked )
+mxLbColumns->set_toggle(rEntry, TRISTATE_TRUE);
+else
+mxLbColumns->set_toggle(rEntry, TRISTATE_FALSE);
+
+return false;
+});
+}
+}
+
 ScTpSubTotalGroup1::~ScTpSubTotalGroup1()
 {
 }
diff --git a/sc/source/ui/inc/tpsubt.hxx b/sc/source/ui/inc/tpsubt.hxx
index d5a2ca023eed..93652127d026 100644
--- a/sc/source/ui/inc/tpsubt.hxx
+++ b/sc/

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

[Tomofumi Yagi (via logerrit)]

 sc/source/ui/dbgui/scuiasciiopt.cxx |   41 +++-
 1 file changed, 22 insertions(+), 19 deletions(-)

New commits:
commit 2a338d521618333a0630a31b46fd0fc9decbe0e5
Author: Tomofumi Yagi 
AuthorDate: Sat Oct 3 19:16:43 2020 +0900
Commit: Mike Kaganski 
CommitDate: Sun Oct 4 13:23:34 2020 +0200

sc: ucsdet_detect may return nullptr

ucsdet_detect function needs a NULL checking of the return value.

"a UCharsetMatch representing the best matching charset, or NULL if no 
charset
matches the byte data."

Change-Id: I7e9a4b03ffd3c5e3f4953c2c7964dc67a53c39b5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103890
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx 
b/sc/source/ui/dbgui/scuiasciiopt.cxx
index bfc154bffc08..be524ab15437 100644
--- a/sc/source/ui/dbgui/scuiasciiopt.cxx
+++ b/sc/source/ui/dbgui/scuiasciiopt.cxx
@@ -394,28 +394,31 @@ ScImportAsciiDlg::ScImportAsciiDlg(weld::Window* pParent, 
const OUString& aDatNa
 UErrorCode uerr = U_ZERO_ERROR;
 UCharsetDetector* ucd = ucsdet_open(  );
 ucsdet_setText( ucd, reinterpret_cast(bytes), nRead, 
 );
-const UCharsetMatch* match = ucsdet_detect( ucd,  );
-const char* pEncodingName = ucsdet_getName( match,  );
 
-if ( U_SUCCESS(uerr) && !strcmp("UTF-8", pEncodingName) )
+if ( const UCharsetMatch* match = ucsdet_detect(ucd, ) )
 {
-ePreselectUnicode = RTL_TEXTENCODING_UTF8; // UTF-8
-mpDatStream->StartReadingUnicodeText( RTL_TEXTENCODING_UTF8 );
+const char* pEncodingName = ucsdet_getName( match,  );
+
+if ( U_SUCCESS(uerr) && !strcmp("UTF-8", pEncodingName) )
+{
+ePreselectUnicode = RTL_TEXTENCODING_UTF8; // UTF-8
+mpDatStream->StartReadingUnicodeText( 
RTL_TEXTENCODING_UTF8 );
+}
+else if ( U_SUCCESS(uerr) && !strcmp("UTF-16LE", 
pEncodingName) )
+{
+ePreselectUnicode = RTL_TEXTENCODING_UNICODE; // UTF-16LE
+mpDatStream->SetEndian( SvStreamEndian::LITTLE );
+mpDatStream->StartReadingUnicodeText( 
RTL_TEXTENCODING_UNICODE );
+}
+else if ( U_SUCCESS(uerr) && !strcmp("UTF-16BE", 
pEncodingName) )
+{
+ePreselectUnicode = RTL_TEXTENCODING_UNICODE; // UTF-16BE
+mpDatStream->SetEndian( SvStreamEndian::BIG );
+mpDatStream->StartReadingUnicodeText( 
RTL_TEXTENCODING_UNICODE );
+}
+else // other
+mpDatStream->StartReadingUnicodeText( 
RTL_TEXTENCODING_DONTKNOW );
 }
-else if ( U_SUCCESS(uerr) && !strcmp("UTF-16LE", pEncodingName) )
-{
-ePreselectUnicode = RTL_TEXTENCODING_UNICODE; // UTF-16LE
-mpDatStream->SetEndian( SvStreamEndian::LITTLE );
-mpDatStream->StartReadingUnicodeText( RTL_TEXTENCODING_UNICODE 
);
-}
-else if ( U_SUCCESS(uerr) && !strcmp("UTF-16BE", pEncodingName) )
-{
-ePreselectUnicode = RTL_TEXTENCODING_UNICODE; // UTF-16BE
-mpDatStream->SetEndian(SvStreamEndian::BIG);
-mpDatStream->StartReadingUnicodeText( RTL_TEXTENCODING_UNICODE 
);
-}
-else // other
-mpDatStream->StartReadingUnicodeText( 
RTL_TEXTENCODING_DONTKNOW );
 
 ucsdet_close( ucd );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/CppunitTest_sw_txtimport.mk sw/CppunitTest_sw_uwriter.mk sw/Library_sw.mk sw/Module_sw.mk sw/qa sw/source

[Tomofumi Yagi (via logerrit)]

 sw/CppunitTest_sw_txtimport.mk|   63 
 sw/CppunitTest_sw_uwriter.mk  |2 
 sw/Library_sw.mk  |1 
 sw/Module_sw.mk   |1 
 sw/qa/extras/txtexport/txtexport.cxx  |   97 ++---
 sw/qa/extras/txtimport/data/UTF16BEWITHBOM.txt|binary
 sw/qa/extras/txtimport/data/UTF16BEWITHOUTBOM.txt |binary
 sw/qa/extras/txtimport/data/UTF16LEWITHBOM.txt|binary
 sw/qa/extras/txtimport/data/UTF16LEWITHOUTBOM.txt |binary
 sw/qa/extras/txtimport/data/UTF8WITHBOM.txt   |2 
 sw/qa/extras/txtimport/data/UTF8WITHOUTBOM.txt|2 
 sw/qa/extras/txtimport/data/bullets.odt   |binary
 sw/qa/extras/txtimport/txtimport.cxx  |  155 ++
 sw/source/filter/basflt/iodetect.cxx  |   27 +++
 14 files changed, 269 insertions(+), 81 deletions(-)

New commits:
commit ef77a256de527f6d00212839e55f949024f2e7bc
Author: Tomofumi Yagi 
AuthorDate: Wed Sep 16 18:11:22 2020 +0900
Commit: Michael Stahl 
CommitDate: Wed Sep 30 10:18:23 2020 +0200

tdf#60145 sw: fix UTF-8 encoding without BOM is not detected

Writer can now detect Unicode type even if importing text file does not
have a BOM.

Change-Id: I70fa4145672d855f9ef9df040a930ff5d1564905
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102884
Tested-by: Jenkins
Reviewed-by: Eike Rathke 
Reviewed-by: Michael Stahl 

diff --git a/sw/CppunitTest_sw_txtimport.mk b/sw/CppunitTest_sw_txtimport.mk
new file mode 100644
index ..646a2ea83391
--- /dev/null
+++ b/sw/CppunitTest_sw_txtimport.mk
@@ -0,0 +1,63 @@
+# -*- 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,sw_txtimport))
+
+$(eval $(call gb_CppunitTest_use_common_precompiled_header,sw_txtimport))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,sw_txtimport, \
+sw/qa/extras/txtimport/txtimport \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,sw_txtimport, \
+comphelper \
+cppu \
+cppuhelper \
+i18nlangtag \
+sal \
+sfx \
+sw \
+   swqahelper \
+test \
+tl \
+unotest \
+utl \
+vcl \
+$(gb_UWINAPI) \
+))
+
+$(eval $(call gb_CppunitTest_use_externals,sw_txtimport,\
+boost_headers \
+libxml2 \
+))
+
+$(eval $(call gb_CppunitTest_set_include,sw_txtimport,\
+-I$(SRCDIR)/sw/inc \
+-I$(SRCDIR)/sw/source/core/inc \
+-I$(SRCDIR)/sw/source/uibase/inc \
+-I$(SRCDIR)/sw/qa/inc \
+$$(INCLUDE) \
+))
+
+$(eval $(call gb_CppunitTest_use_api,sw_txtimport,\
+   udkapi \
+   offapi \
+   oovbaapi \
+))
+
+$(eval $(call gb_CppunitTest_use_ure,sw_txtimport))
+$(eval $(call gb_CppunitTest_use_vcl,sw_txtimport))
+
+$(eval $(call gb_CppunitTest_use_rdb,sw_txtimport,services))
+
+$(eval $(call gb_CppunitTest_use_configuration,sw_txtimport))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sw/CppunitTest_sw_uwriter.mk b/sw/CppunitTest_sw_uwriter.mk
index 6b9ffa4ba683..e6a490c5dff1 100644
--- a/sw/CppunitTest_sw_uwriter.mk
+++ b/sw/CppunitTest_sw_uwriter.mk
@@ -64,7 +64,9 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_uwriter, \
 
 $(eval $(call gb_CppunitTest_use_externals,sw_uwriter,\
boost_headers \
+   icui18n \
icuuc \
+   icu_headers \
libxml2 \
 ))
 
diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk
index 2de7d6b0e4dc..65f4154bf12e 100644
--- a/sw/Library_sw.mk
+++ b/sw/Library_sw.mk
@@ -87,6 +87,7 @@ $(eval $(call gb_Library_use_libraries,sw,\
 
 $(eval $(call gb_Library_use_externals,sw,\
boost_headers \
+   icui18n \
icuuc \
icu_headers \
libxml2 \
diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk
index ec6e73fd2779..2f8a9a35ed01 100644
--- a/sw/Module_sw.mk
+++ b/sw/Module_sw.mk
@@ -97,6 +97,7 @@ $(eval $(call gb_Module_add_slowcheck_targets,sw,\
 CppunitTest_sw_odfexport \
 CppunitTest_sw_odfimport \
 CppunitTest_sw_txtexport \
+CppunitTest_sw_txtimport \
 $(if $(filter-out MACOSX,$(OS)), \
 CppunitTest_sw_uiwriter \
 ) \
diff --git a/sw/qa/extras/txtexport/txtexport.cxx 
b/sw/qa/extras/txtexport/txtexport.cxx
index d7246d05aced..0151ee289cc3 100644
--- a/sw/qa/extras/txtexport/txtexport.cxx
+++ b/sw/qa/extras/txtexport/txtexport.cxx
@@ -15,42 +15,13 @@
 #include 
 #include 
 
-class TxtImportTest : public SwModelTestBase
+class TxtExportTest : public SwModelTestBase
 {
 public:
-TxtImportTest() :
-SwModelTestBase("/sw/qa/e

[Libreoffice-commits] core.git: Branch 'libreoffice-7-0-2' - include/svtools svtools/source

[Tomofumi Yagi (via logerrit)]

 include/svtools/filechangedchecker.hxx |2 +-
 svtools/source/misc/filechangedchecker.cxx |   21 -
 2 files changed, 13 insertions(+), 10 deletions(-)

New commits:
commit d62fe22aed6acf36c5321a417beb4c37a5f715a2
Author: Tomofumi Yagi 
AuthorDate: Fri Sep 18 16:21:43 2020 +0900
Commit: Xisco Fauli 
CommitDate: Mon Sep 28 19:39:30 2020 +0200

tdf#134157 fix Edit with external tool causes a CPU hit

Switch Idle to 100ms Timer for fixing the bug

Change-Id: I85a9bdcb173edd28d952d8e91c1b93d748e69206
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102984
Tested-by: Jenkins
Reviewed-by: Noel Grandin 
(cherry picked from commit f110c037114f90d219ac8d149542bf96fe66a2f1)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103055
Reviewed-by: Caolán McNamara 
(cherry picked from commit 1d28170d94893171e2a358274cda62cd73f7b834)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103059
Reviewed-by: Tomofumi Yagi 
Reviewed-by: Xisco Fauli 
Tested-by: Xisco Fauli 

diff --git a/include/svtools/filechangedchecker.hxx 
b/include/svtools/filechangedchecker.hxx
index 3b7f817f3035..016fe9279800 100644
--- a/include/svtools/filechangedchecker.hxx
+++ b/include/svtools/filechangedchecker.hxx
@@ -29,7 +29,7 @@ class Timer;
 class UNLESS_MERGELIBS(SVT_DLLPUBLIC) FileChangedChecker
 {
 private:
-IdlemIdle;
+TimermTimer;
 OUString mFileName;
 TimeValuemLastModTime;
 ::std::function mpCallback;
diff --git a/svtools/source/misc/filechangedchecker.cxx 
b/svtools/source/misc/filechangedchecker.cxx
index 09e24c3fafb1..8536eb0bda57 100644
--- a/svtools/source/misc/filechangedchecker.cxx
+++ b/svtools/source/misc/filechangedchecker.cxx
@@ -16,7 +16,7 @@
 
 FileChangedChecker::FileChangedChecker(const OUString& rFilename,
 const ::std::function& rCallback)
-: mIdle("SVTools FileChangedChecker Idle")
+: mTimer("SVTools FileChangedChecker Timer")
 , mFileName(rFilename)
 , mLastModTime()
 , mpCallback(rCallback)
@@ -24,21 +24,24 @@ FileChangedChecker::FileChangedChecker(const OUString& 
rFilename,
 // Get the curren last file modified Status
 getCurrentModTime(mLastModTime);
 
-// associate the callback function for the Idle
-mIdle.SetInvokeHandler(LINK(this, FileChangedChecker, TimerHandler));
+// associate the callback function for the Timer
+mTimer.SetInvokeHandler(LINK(this, FileChangedChecker, TimerHandler));
 
-//start the timer
+// set timer interval
+mTimer.SetTimeout(100);
+
+// start the timer
 resetTimer();
 }
 
 void FileChangedChecker::resetTimer()
 {
-//Start the Idle if it's not active
-if(!mIdle.IsActive())
-mIdle.Start();
+// Start the Idle if it's not active
+if(!mTimer.IsActive())
+mTimer.Start();
 
 // Set lowest Priority
-mIdle.SetPriority(TaskPriority::LOWEST);
+mTimer.SetPriority(TaskPriority::LOWEST);
 }
 
 bool FileChangedChecker::getCurrentModTime(TimeValue& o_rValue) const
@@ -90,7 +93,7 @@ IMPL_LINK_NOARG(FileChangedChecker, TimerHandler, Timer *, 
void)
 mpCallback();
 }
 
-// Reset the Idle in any case
+// Reset the Timer in any case
 resetTimer();
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - include/svtools svtools/source

[Tomofumi Yagi (via logerrit)]

 include/svtools/filechangedchecker.hxx |2 +-
 svtools/source/misc/filechangedchecker.cxx |   21 -
 2 files changed, 13 insertions(+), 10 deletions(-)

New commits:
commit bd1345f9806b1bb9940d208d75610f7c4556f05d
Author: Tomofumi Yagi 
AuthorDate: Fri Sep 18 16:21:43 2020 +0900
Commit: Noel Grandin 
CommitDate: Tue Sep 22 08:40:34 2020 +0200

tdf#134157 fix Edit with external tool causes a CPU hit

Switch Idle to 100ms Timer for fixing the bug

Change-Id: I85a9bdcb173edd28d952d8e91c1b93d748e69206
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102984
Tested-by: Jenkins
Reviewed-by: Noel Grandin 
(cherry picked from commit f110c037114f90d219ac8d149542bf96fe66a2f1)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103055
Reviewed-by: Caolán McNamara 
Signed-off-by: Xisco Fauli 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103130

diff --git a/include/svtools/filechangedchecker.hxx 
b/include/svtools/filechangedchecker.hxx
index ec8d8a41fdac..a1c2fcb38eaa 100644
--- a/include/svtools/filechangedchecker.hxx
+++ b/include/svtools/filechangedchecker.hxx
@@ -28,7 +28,7 @@ class Timer;
 class SVT_DLLPUBLIC FileChangedChecker
 {
 private:
-IdlemIdle;
+TimermTimer;
 OUString const   mFileName;
 TimeValuemLastModTime;
 ::std::function const mpCallback;
diff --git a/svtools/source/misc/filechangedchecker.cxx 
b/svtools/source/misc/filechangedchecker.cxx
index 09e24c3fafb1..8536eb0bda57 100644
--- a/svtools/source/misc/filechangedchecker.cxx
+++ b/svtools/source/misc/filechangedchecker.cxx
@@ -16,7 +16,7 @@
 
 FileChangedChecker::FileChangedChecker(const OUString& rFilename,
 const ::std::function& rCallback)
-: mIdle("SVTools FileChangedChecker Idle")
+: mTimer("SVTools FileChangedChecker Timer")
 , mFileName(rFilename)
 , mLastModTime()
 , mpCallback(rCallback)
@@ -24,21 +24,24 @@ FileChangedChecker::FileChangedChecker(const OUString& 
rFilename,
 // Get the curren last file modified Status
 getCurrentModTime(mLastModTime);
 
-// associate the callback function for the Idle
-mIdle.SetInvokeHandler(LINK(this, FileChangedChecker, TimerHandler));
+// associate the callback function for the Timer
+mTimer.SetInvokeHandler(LINK(this, FileChangedChecker, TimerHandler));
 
-//start the timer
+// set timer interval
+mTimer.SetTimeout(100);
+
+// start the timer
 resetTimer();
 }
 
 void FileChangedChecker::resetTimer()
 {
-//Start the Idle if it's not active
-if(!mIdle.IsActive())
-mIdle.Start();
+// Start the Idle if it's not active
+if(!mTimer.IsActive())
+mTimer.Start();
 
 // Set lowest Priority
-mIdle.SetPriority(TaskPriority::LOWEST);
+mTimer.SetPriority(TaskPriority::LOWEST);
 }
 
 bool FileChangedChecker::getCurrentModTime(TimeValue& o_rValue) const
@@ -90,7 +93,7 @@ IMPL_LINK_NOARG(FileChangedChecker, TimerHandler, Timer *, 
void)
 mpCallback();
 }
 
-// Reset the Idle in any case
+// Reset the Timer in any case
 resetTimer();
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - include/svtools svtools/source

[Tomofumi Yagi (via logerrit)]

 include/svtools/filechangedchecker.hxx |2 +-
 svtools/source/misc/filechangedchecker.cxx |   21 -
 2 files changed, 13 insertions(+), 10 deletions(-)

New commits:
commit 1d28170d94893171e2a358274cda62cd73f7b834
Author: Tomofumi Yagi 
AuthorDate: Fri Sep 18 16:21:43 2020 +0900
Commit: Caolán McNamara 
CommitDate: Mon Sep 21 17:56:50 2020 +0200

tdf#134157 fix Edit with external tool causes a CPU hit

Switch Idle to 100ms Timer for fixing the bug

Change-Id: I85a9bdcb173edd28d952d8e91c1b93d748e69206
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102984
Tested-by: Jenkins
Reviewed-by: Noel Grandin 
(cherry picked from commit f110c037114f90d219ac8d149542bf96fe66a2f1)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103055
Reviewed-by: Caolán McNamara 

diff --git a/include/svtools/filechangedchecker.hxx 
b/include/svtools/filechangedchecker.hxx
index 3b7f817f3035..016fe9279800 100644
--- a/include/svtools/filechangedchecker.hxx
+++ b/include/svtools/filechangedchecker.hxx
@@ -29,7 +29,7 @@ class Timer;
 class UNLESS_MERGELIBS(SVT_DLLPUBLIC) FileChangedChecker
 {
 private:
-IdlemIdle;
+TimermTimer;
 OUString mFileName;
 TimeValuemLastModTime;
 ::std::function mpCallback;
diff --git a/svtools/source/misc/filechangedchecker.cxx 
b/svtools/source/misc/filechangedchecker.cxx
index 09e24c3fafb1..8536eb0bda57 100644
--- a/svtools/source/misc/filechangedchecker.cxx
+++ b/svtools/source/misc/filechangedchecker.cxx
@@ -16,7 +16,7 @@
 
 FileChangedChecker::FileChangedChecker(const OUString& rFilename,
 const ::std::function& rCallback)
-: mIdle("SVTools FileChangedChecker Idle")
+: mTimer("SVTools FileChangedChecker Timer")
 , mFileName(rFilename)
 , mLastModTime()
 , mpCallback(rCallback)
@@ -24,21 +24,24 @@ FileChangedChecker::FileChangedChecker(const OUString& 
rFilename,
 // Get the curren last file modified Status
 getCurrentModTime(mLastModTime);
 
-// associate the callback function for the Idle
-mIdle.SetInvokeHandler(LINK(this, FileChangedChecker, TimerHandler));
+// associate the callback function for the Timer
+mTimer.SetInvokeHandler(LINK(this, FileChangedChecker, TimerHandler));
 
-//start the timer
+// set timer interval
+mTimer.SetTimeout(100);
+
+// start the timer
 resetTimer();
 }
 
 void FileChangedChecker::resetTimer()
 {
-//Start the Idle if it's not active
-if(!mIdle.IsActive())
-mIdle.Start();
+// Start the Idle if it's not active
+if(!mTimer.IsActive())
+mTimer.Start();
 
 // Set lowest Priority
-mIdle.SetPriority(TaskPriority::LOWEST);
+mTimer.SetPriority(TaskPriority::LOWEST);
 }
 
 bool FileChangedChecker::getCurrentModTime(TimeValue& o_rValue) const
@@ -90,7 +93,7 @@ IMPL_LINK_NOARG(FileChangedChecker, TimerHandler, Timer *, 
void)
 mpCallback();
 }
 
-// Reset the Idle in any case
+// Reset the Timer in any case
 resetTimer();
 }
 
___
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

[Tomofumi Yagi (via logerrit)]

 include/svtools/filechangedchecker.hxx |2 +-
 svtools/source/misc/filechangedchecker.cxx |   21 -
 2 files changed, 13 insertions(+), 10 deletions(-)

New commits:
commit f110c037114f90d219ac8d149542bf96fe66a2f1
Author: Tomofumi Yagi 
AuthorDate: Fri Sep 18 16:21:43 2020 +0900
Commit: Noel Grandin 
CommitDate: Sat Sep 19 08:51:14 2020 +0200

tdf#134157 fix Edit with external tool causes a CPU hit

Switch Idle to 100ms Timer for fixing the bug

Change-Id: I85a9bdcb173edd28d952d8e91c1b93d748e69206
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102984
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/include/svtools/filechangedchecker.hxx 
b/include/svtools/filechangedchecker.hxx
index 3b7f817f3035..016fe9279800 100644
--- a/include/svtools/filechangedchecker.hxx
+++ b/include/svtools/filechangedchecker.hxx
@@ -29,7 +29,7 @@ class Timer;
 class UNLESS_MERGELIBS(SVT_DLLPUBLIC) FileChangedChecker
 {
 private:
-IdlemIdle;
+TimermTimer;
 OUString mFileName;
 TimeValuemLastModTime;
 ::std::function mpCallback;
diff --git a/svtools/source/misc/filechangedchecker.cxx 
b/svtools/source/misc/filechangedchecker.cxx
index 09e24c3fafb1..8536eb0bda57 100644
--- a/svtools/source/misc/filechangedchecker.cxx
+++ b/svtools/source/misc/filechangedchecker.cxx
@@ -16,7 +16,7 @@
 
 FileChangedChecker::FileChangedChecker(const OUString& rFilename,
 const ::std::function& rCallback)
-: mIdle("SVTools FileChangedChecker Idle")
+: mTimer("SVTools FileChangedChecker Timer")
 , mFileName(rFilename)
 , mLastModTime()
 , mpCallback(rCallback)
@@ -24,21 +24,24 @@ FileChangedChecker::FileChangedChecker(const OUString& 
rFilename,
 // Get the curren last file modified Status
 getCurrentModTime(mLastModTime);
 
-// associate the callback function for the Idle
-mIdle.SetInvokeHandler(LINK(this, FileChangedChecker, TimerHandler));
+// associate the callback function for the Timer
+mTimer.SetInvokeHandler(LINK(this, FileChangedChecker, TimerHandler));
 
-//start the timer
+// set timer interval
+mTimer.SetTimeout(100);
+
+// start the timer
 resetTimer();
 }
 
 void FileChangedChecker::resetTimer()
 {
-//Start the Idle if it's not active
-if(!mIdle.IsActive())
-mIdle.Start();
+// Start the Idle if it's not active
+if(!mTimer.IsActive())
+mTimer.Start();
 
 // Set lowest Priority
-mIdle.SetPriority(TaskPriority::LOWEST);
+mTimer.SetPriority(TaskPriority::LOWEST);
 }
 
 bool FileChangedChecker::getCurrentModTime(TimeValue& o_rValue) const
@@ -90,7 +93,7 @@ IMPL_LINK_NOARG(FileChangedChecker, TimerHandler, Timer *, 
void)
 mpCallback();
 }
 
-// Reset the Idle in any case
+// Reset the Timer in any case
 resetTimer();
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tomofumi Yagi (via logerrit)]

 sc/Library_scui.mk  |3 +
 sc/source/ui/dbgui/scuiasciiopt.cxx |   71 +++-
 2 files changed, 41 insertions(+), 33 deletions(-)

New commits:
commit 85f12e47f4a086a3923dd3a6b097776d60c6dc82
Author: Tomofumi Yagi 
AuthorDate: Sat Sep 12 11:47:10 2020 +0900
Commit: Noel Grandin 
CommitDate: Sun Sep 13 13:21:43 2020 +0200

Calc: ScImportAsciiDlg can now detect Unicode encoding without BOM

Change-Id: I8a3aa7458ce97f659c0caf2386a96f605b740fbc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102543
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/sc/Library_scui.mk b/sc/Library_scui.mk
index a8c2097485b0..86605ab63a0d 100644
--- a/sc/Library_scui.mk
+++ b/sc/Library_scui.mk
@@ -39,6 +39,9 @@ $(eval $(call gb_Library_use_externals,scui,\
$(call gb_Helper_optional,OPENCL, \
clew) \
mdds_headers \
+   icui18n \
+   icuuc \
+   icu_headers \
 ))
 
 $(eval $(call gb_Library_use_libraries,scui,\
diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx 
b/sc/source/ui/dbgui/scuiasciiopt.cxx
index a0e645e551e0..5e5f08bf87a7 100644
--- a/sc/source/ui/dbgui/scuiasciiopt.cxx
+++ b/sc/source/ui/dbgui/scuiasciiopt.cxx
@@ -37,6 +37,9 @@
 #include 
 #include 
 
+#include 
+#include 
+
 //! TODO make dynamic
 const SCSIZE ASCIIDLG_MAXROWS= MAXROWCOUNT;
 
@@ -380,41 +383,43 @@ ScImportAsciiDlg::ScImportAsciiDlg(weld::Window* pParent, 
const OUString& aDatNa
 // Sniff for Unicode / not
 if( ePreselectUnicode == RTL_TEXTENCODING_DONTKNOW && mpDatStream )
 {
-Seek( 0 );
-mpDatStream->StartReadingUnicodeText( RTL_TEXTENCODING_DONTKNOW );
-sal_uLong nUniPos = mpDatStream->Tell();
-switch (nUniPos)
+mpDatStream->Seek( 0 );
+constexpr size_t buffsize = 4096;
+sal_Int8 bytes[buffsize] = { 0 };
+sal_Int32 nRead = mpDatStream->ReadBytes( bytes, buffsize );
+mpDatStream->Seek( 0 );
+
+if ( nRead > 0 )
 {
-case 2:
-ePreselectUnicode = RTL_TEXTENCODING_UNICODE;   // UTF-16
-break;
-case 3:
-ePreselectUnicode = RTL_TEXTENCODING_UTF8;  // UTF-8
-break;
-case 0:
-{
-sal_uInt16 n;
-mpDatStream->ReadUInt16( n );
-// Assume that normal ASCII/ANSI/ISO/etc. text doesn't 
start with
-// control characters except CR,LF,TAB
-if ( (n & 0xff00) < 0x2000 )
-{
-switch ( n & 0xff00 )
-{
-case 0x0900 :
-case 0x0a00 :
-case 0x0d00 :
-break;
-default:
-ePreselectUnicode = RTL_TEXTENCODING_UNICODE;  
 // UTF-16
-}
-}
-mpDatStream->Seek(0);
-}
-break;
-default:
-;   // nothing
+UErrorCode uerr = U_ZERO_ERROR;
+UCharsetDetector* ucd = ucsdet_open(  );
+ucsdet_setText( ucd, reinterpret_cast(bytes), nRead, 
 );
+const UCharsetMatch* match = ucsdet_detect( ucd,  );
+const char* pEncodingName = ucsdet_getName( match,  );
+
+if ( U_SUCCESS(uerr) && !strcmp("UTF-8", pEncodingName) )
+{
+ePreselectUnicode = RTL_TEXTENCODING_UTF8; // UTF-8
+mpDatStream->StartReadingUnicodeText( RTL_TEXTENCODING_UTF8 );
+}
+else if ( U_SUCCESS(uerr) && !strcmp("UTF-16LE", pEncodingName) )
+{
+ePreselectUnicode = RTL_TEXTENCODING_UNICODE; // UTF-16LE
+mpDatStream->SetEndian( SvStreamEndian::LITTLE );
+mpDatStream->StartReadingUnicodeText( RTL_TEXTENCODING_UNICODE 
);
+}
+else if ( U_SUCCESS(uerr) && !strcmp("UTF-16BE", pEncodingName) )
+{
+ePreselectUnicode = RTL_TEXTENCODING_UNICODE; // UTF-16BE
+mpDatStream->SetEndian(SvStreamEndian::BIG);
+mpDatStream->StartReadingUnicodeText( RTL_TEXTENCODING_UNICODE 
);
+}
+else // other
+mpDatStream->StartReadingUnicodeText( 
RTL_TEXTENCODING_DONTKNOW );
+
+ucsdet_close( ucd );
 }
+
 mnStreamPos = mpDatStream->Tell();
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: officecfg/registry unotools/qa unotools/source vcl/quartz

[Tomofumi Yagi (via logerrit)]

 officecfg/registry/data/org/openoffice/VCL.xcu |   16 
 unotools/qa/unit/testGetEnglishSearchName.cxx  |   25 +
 unotools/source/misc/fontdefs.cxx  |2 ++
 vcl/quartz/ctfonts.cxx |7 ++-
 4 files changed, 33 insertions(+), 17 deletions(-)

New commits:
commit c663d0bcc93b278f50c8f6802928a7a6154207f2
Author: Tomofumi Yagi 
AuthorDate: Sun Oct 20 08:24:13 2019 +0900
Commit: Noel Grandin 
CommitDate: Sat Mar 21 10:29:13 2020 +0100

tdf#128276 Font names are not localized on macOS Catalina

1. We would like to call CTFontDescriptorCopyLocalizedAttribute function
simply.
We don't need to compare language settings of LibreOffice UI to OS lang-
uage settings.
This comparison was a way to save users from confusion, but it was bad
idea.
Because CTFontDescriptorCopyLocalizedAttribute function before macOS
Catalina returns RFC 3066 bis as a language tag, but LibreOffice and
macOS Catalina uses BCP 47 as a language tag.
CTFontDescriptorCopyLocalizedAttribute function use the language setting
for the operating system, therefore Users will change it if needed.

2. Fix font aliases on macOS Catalina
I added some entries because I notice that those doesn't working with
a Hiragino Sans font alias.

Change-Id: Ie05a96f45cba13a19fcc1b855bd908f397e585a1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/81145
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/officecfg/registry/data/org/openoffice/VCL.xcu 
b/officecfg/registry/data/org/openoffice/VCL.xcu
index 40fce619cf7c..271731c28e65 100644
--- a/officecfg/registry/data/org/openoffice/VCL.xcu
+++ b/officecfg/registry/data/org/openoffice/VCL.xcu
@@ -214,28 +214,28 @@
 Noto Serif CJK JP;游明朝;ＭＳ 明朝;ＭＳ Ｐ明朝;ヒラギノ明朝 ProN;ヒラギノ明朝 Pro;IPA 
明朝;IPA P明朝;Mincho;Serif
   
   
-Noto Sans CJK JP;游ゴシック;ＭＳ ゴシック;ＭＳ Ｐゴシック;ヒラギノ角ゴ ProN;ヒラギノ角ゴ 
Pro;IPA ゴシック;IPA Pゴシック;Gothic;ＭＳ 明朝;Mincho;ＭＳ Ｐ明朝;Gothic
+Noto Sans CJK JP;游ゴシック;ＭＳ ゴシック;ＭＳ Ｐゴシック;ヒラギノ角ゴシック;ヒラギノ角ゴ 
ProN;ヒラギノ角ゴ Pro;IPA ゴシック;IPA Pゴシック;Gothic;ＭＳ 明朝;Mincho;ＭＳ Ｐ明朝;Gothic
   
   
-Noto Sans CJK JP;ヒラギノ角ゴ ProN;ヒラギノ角ゴ Pro;游ゴシック;ＭＳ Ｐゴシック;IPA 
Pゴシック;ＭＳ ゴシック;ＭＳ Ｐゴシック;Gothic
+Noto Sans CJK JP;ヒラギノ角ゴシック;ヒラギノ角ゴ ProN;ヒラギノ角ゴ Pro;游ゴシック;ＭＳ 
Ｐゴシック;IPA Pゴシック;ＭＳ ゴシック;ＭＳ Ｐゴシック;Gothic
   
   
-Noto Sans CJK JP;ヒラギノ角ゴ ProN;ヒラギノ角ゴ Pro;游ゴシック;ＭＳ Ｐゴシック;IPA 
Pゴシック;ＭＳ ゴシック;ＭＳ Ｐゴシック;Gothic
+Noto Sans CJK JP;ヒラギノ角ゴシック;ヒラギノ角ゴ ProN;ヒラギノ角ゴ Pro;游ゴシック;ＭＳ 
Ｐゴシック;IPA Pゴシック;ＭＳ ゴシック;ＭＳ Ｐゴシック;Gothic
   
   
-Noto Sans CJK JP;游ゴシック;ＭＳ Ｐゴシック;ヒラギノ角ゴ ProN;ヒラギノ角ゴ Pro;IPA 
Pゴシック;Gothic
+Noto Sans CJK JP;游ゴシック;ＭＳ Ｐゴシック;ヒラギノ角ゴシック;ヒラギノ角ゴ ProN;ヒラギノ角ゴ 
Pro;IPA Pゴシック;Gothic
   
   
-Noto Sans CJK JP;游ゴシック;ＭＳ Ｐゴシック;ヒラギノ角ゴ ProN;ヒラギノ角ゴ Pro;IPA 
Pゴシック;MS Gothic;MS PGothic;Gothic
+Noto Sans CJK JP;游ゴシック;ＭＳ Ｐゴシック;ヒラギノ角ゴシック;ヒラギノ角ゴ ProN;ヒラギノ角ゴ 
Pro;IPA Pゴシック;MS Gothic;MS PGothic;Gothic
   
   
-Noto Sans Mono CJK JP;Yu Gothic UI;ＭＳ ゴシック;Osaka;ヒラギノ角ゴ 
ProN;ヒラギノ角ゴ Pro;IPAゴシック;Gothic
+Noto Sans Mono CJK JP;Yu Gothic UI;ＭＳ 
ゴシック;Osaka;ヒラギノ角ゴシック;ヒラギノ角ゴ ProN;ヒラギノ角ゴ Pro;IPAゴシック;Gothic
   
   
-Noto Sans Mono CJK JP:ＭＳ ゴシック;ヒラギノ角ゴ ProN;ヒラギノ角ゴ 
Pro;IPAゴシック;Gothic
+Noto Sans Mono CJK JP:ＭＳ ゴシック;ヒラギノ角ゴシック;ヒラギノ角ゴ ProN;ヒラギノ角ゴ 
Pro;IPAゴシック;Gothic
   
   
-IPA Pゴシック;IPA P Gothic;Noto Sans CJK JP;Yu Gothic UI;Meiryo 
UI;ヒラギノ角ゴ ProN;Hiragino Kaku Gothic ProN;ヒラギノ角ゴ Pro;Hiragino Kaku Gothic 
Pro
+IPA Pゴシック;IPA P Gothic;Noto Sans CJK JP;Yu Gothic UI;Meiryo 
UI;ヒラギノ角ゴシック;ヒラギノ角ゴ ProN;Hiragino Kaku Gothic ProN;ヒラギノ角ゴ Pro;Hiragino Kaku 
Gothic Pro
   
   
 
cumberlandamt;cumberland;couriernew;nimbusmonol;courier;lucidasanstypewriter;lucidatypewriter;monaco;monospaced
diff --git a/unotools/qa/unit/testGetEnglishSearchName.cxx 
b/unotools/qa/unit/testGetEnglishSearchName.cxx
index 2889ffaedcf7..4534187052fa 100644
--- a/unotools/qa/unit/testGetEnglishSearchName.cxx
+++ b/unotools/qa/unit/testGetEnglishSearchName.cxx
@@ -43,10 +43,27 @@ void Test::testSingleElement()
 
 //transformation
 
-sal_Unicode const transfor[] ={ 0x30D2, 0x30E9, 0x30AE, 0x30CE, 0x4E38, 
0x30B4, 'p','r','o','n',0};
-
-test1 = GetEnglishSearchFontName(transfor );
-CPPUNIT_ASSERT_EQUAL( OUString("hiraginomarugothicpron"),test1);
+//for Japanese fontname
+// IPAMincho
+sal_Unicode const aIPAMincho[]={'i','p','a', 0x660e, 0x671d,0};
+OUString test_ja_JP1 = GetEnglishSearchFontName(aIPAMincho);
+CPPUNIT_ASSERT_EQUAL( OUString("ipamincho"),test_ja_JP1);
+// IPAGothic
+sal_Unicode const aIPAGothic[]={'i','p','a', 0x30b4, 0x30b7, 0x30c3, 
0x30af,0};
+OUString test_ja_JP2 = GetEnglishSearchFontName(aIPAGothic);
+CPPUNIT_ASSERT_EQUAL( OUString("ipagothic"),test_ja_JP

[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - basic/CppunitTest_basic_macros.mk basic/qa

[Tomofumi Yagi]

 basic/CppunitTest_basic_macros.mk |3 +++
 basic/qa/cppunit/test_vba.cxx |   24 ++--
 2 files changed, 25 insertions(+), 2 deletions(-)

New commits:
commit 63ee1bafe2ec37c65b7f1e25fcb10761bf8f309e
Author: Tomofumi Yagi <ya...@mknada.sakura.ne.jp>
Date:   Sat May 21 19:38:48 2016 +0900

tdf#99696 fix build error for 64bit Windows in unit tests using ADODB

This patch fixes the problem that the build for x64 fails in basic module
on 64bit Windows installed 32bit Excel Application.

New code checks the existance of ODBC driver for excel insted of the
existance of Excel application(at this time the bitness of ODBC driver for
excel would match that of building LibreOffice).

What we need is probably not Excel Application but ODBC drivers for proper
bitness.

Change-Id: I62285eb2351f2022754fc34cb2d54db1bd9e8142
Reviewed-on: https://gerrit.libreoffice.org/25301
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Michael Stahl <mst...@redhat.com>
(cherry picked from commit d2a44e62704f185a0acecbb6320b92a4df3063b9)
Reviewed-on: https://gerrit.libreoffice.org/25981

diff --git a/basic/CppunitTest_basic_macros.mk 
b/basic/CppunitTest_basic_macros.mk
index 13e9235..8d64f40 100644
--- a/basic/CppunitTest_basic_macros.mk
+++ b/basic/CppunitTest_basic_macros.mk
@@ -42,6 +42,9 @@ $(eval $(call gb_CppunitTest_use_libraries,basic_macros, \
 ifeq ($(OS),WNT)
 $(eval $(call gb_CppunitTest_use_system_win32_libs,basic_macros, \
oleaut32 \
+   $(if $(filter 140,$(VCVER)),legacy_stdio_definitions) \
+   odbc32 \
+   odbccp32 \
 ))
 endif
 
diff --git a/basic/qa/cppunit/test_vba.cxx b/basic/qa/cppunit/test_vba.cxx
index 265aaf6..83d243d 100644
--- a/basic/qa/cppunit/test_vba.cxx
+++ b/basic/qa/cppunit/test_vba.cxx
@@ -10,6 +10,13 @@
 #include 
 #include 
 
+#ifdef WIN32
+#include 
+
+#include 
+#include 
+#endif
+
 using namespace ::com::sun::star;
 
 namespace
@@ -96,13 +103,26 @@ void VBATest::testMiscOLEStuff()
 bool bOk = false;
 if( xOLEFactory.is() )
 {
-uno::Reference< uno::XInterface > xExcel = 
xOLEFactory->createInstance( "Excel.Application" );
 uno::Reference< uno::XInterface > xADODB = 
xOLEFactory->createInstance( "ADODB.Connection" );
-   bOk = xExcel.is() && xADODB.is();
+bOk = xADODB.is();
 }
 if ( !bOk )
 return; // can't do anything, skip test
 
+sal_Unicode sBuf[1024*4];
+SQLGetInstalledDriversW( sBuf, sizeof( sBuf ), nullptr );
+
+const sal_Unicode *pODBCDriverName = sBuf;
+bool bFound = false;
+for (; wcslen( pODBCDriverName ) != 0; pODBCDriverName += wcslen( 
pODBCDriverName ) + 1 ) {
+if ( wcsstr( pODBCDriverName, L"Microsoft Excel Driver" ) != nullptr ) 
{
+bFound = true;
+break;
+}
+}
+if ( !bFound )
+return; // can't find ODBC driver needed test, so skip test
+
 const char* macroSource[] = {
 "ole_ObjAssignNoDflt.vb",
 "ole_ObjAssignToNothing.vb",
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: basic/CppunitTest_basic_macros.mk basic/qa

[Tomofumi Yagi]

 basic/CppunitTest_basic_macros.mk |3 +++
 basic/qa/cppunit/test_vba.cxx |   24 ++--
 2 files changed, 25 insertions(+), 2 deletions(-)

New commits:
commit d2a44e62704f185a0acecbb6320b92a4df3063b9
Author: Tomofumi Yagi <ya...@mknada.sakura.ne.jp>
Date:   Sat May 21 19:38:48 2016 +0900

tdf#99696 fix build error for 64bit Windows in unit tests using ADODB

This patch fixes the problem that the build for x64 fails in basic module
on 64bit Windows installed 32bit Excel Application.

New code checks the existance of ODBC driver for excel insted of the
existance of Excel application(at this time the bitness of ODBC driver for
excel would match that of building LibreOffice).

What we need is probably not Excel Application but ODBC drivers for proper
bitness.

Change-Id: I62285eb2351f2022754fc34cb2d54db1bd9e8142
Reviewed-on: https://gerrit.libreoffice.org/25301
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Michael Stahl <mst...@redhat.com>

diff --git a/basic/CppunitTest_basic_macros.mk 
b/basic/CppunitTest_basic_macros.mk
index 13e9235..8d64f40 100644
--- a/basic/CppunitTest_basic_macros.mk
+++ b/basic/CppunitTest_basic_macros.mk
@@ -42,6 +42,9 @@ $(eval $(call gb_CppunitTest_use_libraries,basic_macros, \
 ifeq ($(OS),WNT)
 $(eval $(call gb_CppunitTest_use_system_win32_libs,basic_macros, \
oleaut32 \
+   $(if $(filter 140,$(VCVER)),legacy_stdio_definitions) \
+   odbc32 \
+   odbccp32 \
 ))
 endif
 
diff --git a/basic/qa/cppunit/test_vba.cxx b/basic/qa/cppunit/test_vba.cxx
index 265aaf6..83d243d 100644
--- a/basic/qa/cppunit/test_vba.cxx
+++ b/basic/qa/cppunit/test_vba.cxx
@@ -10,6 +10,13 @@
 #include 
 #include 
 
+#ifdef WIN32
+#include 
+
+#include 
+#include 
+#endif
+
 using namespace ::com::sun::star;
 
 namespace
@@ -96,13 +103,26 @@ void VBATest::testMiscOLEStuff()
 bool bOk = false;
 if( xOLEFactory.is() )
 {
-uno::Reference< uno::XInterface > xExcel = 
xOLEFactory->createInstance( "Excel.Application" );
 uno::Reference< uno::XInterface > xADODB = 
xOLEFactory->createInstance( "ADODB.Connection" );
-   bOk = xExcel.is() && xADODB.is();
+bOk = xADODB.is();
 }
 if ( !bOk )
 return; // can't do anything, skip test
 
+sal_Unicode sBuf[1024*4];
+SQLGetInstalledDriversW( sBuf, sizeof( sBuf ), nullptr );
+
+const sal_Unicode *pODBCDriverName = sBuf;
+bool bFound = false;
+for (; wcslen( pODBCDriverName ) != 0; pODBCDriverName += wcslen( 
pODBCDriverName ) + 1 ) {
+if ( wcsstr( pODBCDriverName, L"Microsoft Excel Driver" ) != nullptr ) 
{
+bFound = true;
+break;
+}
+}
+if ( !bFound )
+return; // can't find ODBC driver needed test, so skip test
+
 const char* macroSource[] = {
 "ole_ObjAssignNoDflt.vb",
 "ole_ObjAssignToNothing.vb",
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tomofumi Yagi]

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

New commits:
commit 6046732216279ff349f683cea6c2f6d151f41f17
Author: Tomofumi Yagi <ya...@mknada.sakura.ne.jp>
Date:   Sun May 8 19:42:36 2016 +0900

tdf#96348 Get rid of unnecessary DLLPUBLIC decorations - VclEventListeners

No need for VclEventListeners to be VCL_DLLPUBLIC

Build passed "make check" on linux and Windows.

Change-Id: Ib3330b3af434ee4d3622c6e0d6ac705c3087c672
Reviewed-on: https://gerrit.libreoffice.org/24766
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Noel Grandin <noelgran...@gmail.com>

diff --git a/vcl/inc/vcleventlisteners.hxx b/vcl/inc/vcleventlisteners.hxx
index 9332b4b..a733499 100644
--- a/vcl/inc/vcleventlisteners.hxx
+++ b/vcl/inc/vcleventlisteners.hxx
@@ -22,7 +22,7 @@
 
 #include 
 
-class VCL_DLLPUBLIC VclEventListeners
+class VclEventListeners
 {
 public:
 void Call( VclSimpleEvent& rEvent ) const;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: config_host.mk.in configure.ac solenv/gbuild

[Tomofumi Yagi]

 config_host.mk.in   |2 ++
 configure.ac|   30 ++
 solenv/gbuild/platform/com_MSC_class.mk |2 +-
 3 files changed, 21 insertions(+), 13 deletions(-)

New commits:
commit 3085aba021b411370ab6bc2400e0652cf279d6d3
Author: Tomofumi Yagi <ya...@mknada.sakura.ne.jp>
Date:   Mon Apr 11 13:33:21 2016 +0900

Fix linking of 64 bit artifacts in 32 bit Windows build with VS2015

In some 64bit Windows environments we get the link error while building
libraries for 64-bit Explorer extensions.
This patch will fix this error.

This error occours only when we build 32bit LibreOffice on 64bit Windows
with Visual Studio 2015.

In some environments UCRT SDK directory does not match Windows SDK
directory.
In that case UCRT library's directory path is incorrect at the linking
phase.

Change-Id: I245b1a70f5e1137a8840aa2e7a70f521eab18cb3
Reviewed-on: https://gerrit.libreoffice.org/23982
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Norbert Thiebaud <nthieb...@gmail.com>

diff --git a/config_host.mk.in b/config_host.mk.in
index 0a2ec0b..60b87bd 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -594,6 +594,8 @@ export TLS=@TLS@
 export TMPDIR=@TEMP_DIRECTORY@
 export TOUCH=@TOUCH@
 export TYPO_EXTENSION_PACK=@TYPO_EXTENSION_PACK@
+export UCRTSDKDIR=@UCRTSDKDIR@
+export UCRTVERSION=@UCRTVERSION@
 export UNOWINREG_DLL=@UNOWINREG_DLL@
 export USE_LIBRARY_BIN_TAR=@USE_LIBRARY_BIN_TAR@
 export USE_XINERAMA=@USE_XINERAMA@
diff --git a/configure.ac b/configure.ac
index 36bb3a0..3f1b7f0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3322,15 +3322,16 @@ find_ucrt()
 {
 reg_get_value_32 "HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Microsoft 
SDKs/Windows/v10.0/InstallationFolder"
 if test -n "$regvalue"; then
-ucrttest=$regvalue
+PathFormat "$regvalue"
+UCRTSDKDIR=$formatted_path
 reg_get_value_32 "HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Microsoft 
SDKs/Windows/v10.0/ProductVersion"
-ucrtdir=$regvalue
+UCRTVERSION=$regvalue
 fi
-if test -z "$ucrttest"; then
+if test -z "$UCRTSDKDIR"; then
 if test -f "$VC_PRODUCT_DIR/../Common7/Tools/vsvars32.bat"; then
 PathFormat "`win_get_env_from_vsvars32bat "UniversalCRTSdkDir"`"
-ucrttest=$formatted_path
-ucrtdir=`win_get_env_from_vsvars32bat "UCRTVersion"`
+UCRTSDKDIR=$formatted_path
+UCRTVERSION=`win_get_env_from_vsvars32bat "UCRTVersion"`
 fi
 fi
 }
@@ -3421,6 +3422,9 @@ if test "$_os" = "WINNT"; then
 AC_MSG_RESULT([No])
 fi
 
+UCRTSDKDIR=
+UCRTVERSION=
+
 AC_MSG_CHECKING([whether UCRT is needed for this compiler version])
 if test "$vcnum" = "120"; then
 AC_MSG_RESULT([No])
@@ -3428,10 +3432,10 @@ if test "$_os" = "WINNT"; then
 AC_MSG_RESULT([Yes])
 AC_MSG_CHECKING([for UCRT location])
 find_ucrt
-if test -n "$ucrttest"; then
+if test -n "$UCRTSDKDIR"; then
 AC_MSG_RESULT([found])
-PathFormat "$ucrttest"
-ucrtincpath_formatted="${formatted_path}Include/$ucrtdir/ucrt"
+PathFormat "${UCRTSDKDIR}Include/$UCRTVERSION/ucrt"
+ucrtincpath_formatted=$formatted_path
 # SOLARINC is used for external modules and must be set too.
 # And no, it's not sufficient to set SOLARINC only, as 
configure
 # itself doesn't honour it.
@@ -3443,6 +3447,8 @@ if test "$_os" = "WINNT"; then
 AC_MSG_ERROR([not found])
 fi
 fi
+AC_SUBST(UCRTSDKDIR)
+AC_SUBST(UCRTVERSION)
 
 # Find the proper version of MSBuild.exe to use based on the VS version
 reg_get_value_32 
HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/MSBuild/$vcnumwithdot/MSBuildOverrideTasksPath
@@ -12532,8 +12538,8 @@ if test "$build_os" = "cygwin"; then
 ILIB1="$ILIB1 
-LIBPATH:$WINDOWS_SDK_HOME/lib/$winsdklibsubdir/um/x64"
 fi
 if test $VCVER = 140; then
-PathFormat "$ucrttest"
-ucrtlibpath_formatted="${formatted_path}lib/$ucrtdir/ucrt/x64"
+PathFormat "${UCRTSDKDIR}lib/$UCRTVERSION/ucrt/x64"
+ucrtlibpath_formatted=$formatted_path
 ILIB="$ILIB;$ucrtlibpath_formatted"
 fi
 else
@@ -12546,8 +12552,8 @@ if test "$build_os" = "cygwin"; then
 ILIB1="$ILIB1 
-LIBPATH:$WINDOWS_SDK_HOME/lib/$winsdkl

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

[Tomofumi Yagi]

 vcl/win/gdi/winlayout.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 526790bc2386520a4644a1c8e72e84cd4f10c42f
Author: Tomofumi Yagi <ya...@mknada.sakura.ne.jp>
Date:   Sat Mar 19 13:29:44 2016 +0900

fix windows 64bit build on vs2015

Visual Studio 2015 will report as follows at the time of 64bit build.

/core/vcl/win/gdi/winlayout.cxx(3972): error C2397:
conversion from 'long' to 'FLOAT' requires a narrowing.

Change-Id: I1a96bd9244c693a3d41b4bf4c2df80ad3b106adc
Reviewed-on: https://gerrit.libreoffice.org/23367
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: jan iversen <j...@documentfoundation.org>

diff --git a/vcl/win/gdi/winlayout.cxx b/vcl/win/gdi/winlayout.cxx
index 572f6a9..e073a01 100644
--- a/vcl/win/gdi/winlayout.cxx
+++ b/vcl/win/gdi/winlayout.cxx
@@ -3967,7 +3967,9 @@ bool D2DWriteTextOutRenderer::DrawGlyphs(const Point & 
origin, uint16_t * pGid,
 {
 std::copy(pGid, pGidEnd, glyphIndices);
 std::copy_n(pAdvances, nGlyphs, glyphAdvances);
-std::transform(pOffsets, pOffsets + nGlyphs, glyphOffsets, 
[](Point ) { return DWRITE_GLYPH_OFFSET{ o.X(), o.Y() }; });
+std::transform(pOffsets, pOffsets + nGlyphs,
+glyphOffsets,
+[](Point ) { return 
DWRITE_GLYPH_OFFSET{static_cast(o.X()), static_cast(o.Y()) }; });
 D2D1_POINT_2F baseline = { origin.X() - bounds.Left(), origin.Y() 
- bounds.Top() };
 DWRITE_GLYPH_RUN glyphs = {
 mpFontFace,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: configure.ac

[Tomofumi Yagi]

 configure.ac |   20 
 1 file changed, 20 insertions(+)

New commits:
commit 7fcf65da3bc95371f5d2763bcad21b52bae8ab6a
Author: Tomofumi Yagi <ya...@mknada.sakura.ne.jp>
Date:   Tue Mar 15 21:32:55 2016 +0900

autogen.sh probably should search UCRT for yet another location too

This patch adds a function to autogen.sh.
autogen.sh will search UCRT path using not only registry database but also 
vsvars32.bat(one of Visual Studio Tools).

I seem that autogen.sh fails to find UCRT path in some environments 
installed Visual Studio Community 2015 or Enterprise 2015 at the moment.

Change-Id: Ib24b8f60f0d9a656d3d69931b18fde8a897f4e61
Reviewed-on: https://gerrit.libreoffice.org/23273
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: jan iversen <j...@documentfoundation.org>
Tested-by: jan iversen <j...@documentfoundation.org>

diff --git a/configure.ac b/configure.ac
index c2bb656..d2bdd4d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3386,6 +3386,19 @@ find_msvs()
 done
 }
 
+win_get_env_from_vsvars32bat()
+{
+WRAPPERBATCHFILEPATH="`mktemp -t wrpXX.bat`"
+echo -e "@setlocal\r\n" >> $WRAPPERBATCHFILEPATH
+echo -e "@call \"`cygpath -w 
$VC_PRODUCT_DIR`/../Common7/Tools/vsvars32.bat\"\r\n" >> $WRAPPERBATCHFILEPATH
+echo -e "@echo %$1%\r\n" >> $WRAPPERBATCHFILEPATH
+echo -e "@endlocal\r\n" >> $WRAPPERBATCHFILEPATH
+chmod +x $WRAPPERBATCHFILEPATH
+_win_get_env_from_vsvars32bat="`$WRAPPERBATCHFILEPATH | $SED -e s/^M^J//`"
+rm -f $WRAPPERBATCHFILEPATH
+echo $_win_get_env_from_vsvars32bat
+}
+
 find_ucrt()
 {
 reg_get_value_32 "HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Microsoft 
SDKs/Windows/v10.0/InstallationFolder"
@@ -3394,6 +3407,13 @@ find_ucrt()
 reg_get_value_32 "HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Microsoft 
SDKs/Windows/v10.0/ProductVersion"
 ucrtdir=$regvalue
 fi
+if test -z "$ucrttest"; then
+if test -f "$VC_PRODUCT_DIR/../Common7/Tools/vsvars32.bat"; then
+PathFormat "`win_get_env_from_vsvars32bat "UniversalCRTSdkDir"`"
+ucrttest=$formatted_path
+ucrtdir=`win_get_env_from_vsvars32bat "UCRTVersion"`
+fi
+fi
 }
 
 find_msvc()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: offapi/com sc/source sfx2/source uui/source

[Tomofumi Yagi]

 offapi/com/sun/star/task/DocumentMSPasswordRequest.idl |2 +-
 offapi/com/sun/star/task/DocumentPasswordRequest.idl   |2 +-
 sc/source/filter/ftools/fapihelper.cxx |2 +-
 sfx2/source/appl/appopen.cxx   |2 +-
 uui/source/passworddlg.cxx |7 +--
 5 files changed, 9 insertions(+), 6 deletions(-)

New commits:
commit 7660e4dcecfb19ad8e9e21e5fe53637bd1b9dc6c
Author: Tomofumi Yagi <ya...@mknada.sakura.ne.jp>
Date:   Sat Feb 28 17:43:00 2015 +0900

tdf#89694 Password dialog for opening OOXML shows url-encoded path

We need to convert a path string to decoded it for OOXML with a password as 
ODF
is so. This patch adds the converting process for OOXML.

In addition, this patch moves the decoded-point of URL into
css.task.Document[MS]PasswordRequest ctor from the outside. This 
decoded-point of
URL into ctor is common for OOXML and ODF.

(notes: Strange to say, css.task.Document[MS]PasswordRequest ctor needs 
"aDocURL",
but methods in interaction-handler use "aDocumentName" as the parameter.
Probably this will be fixed in near future.)

Change-Id: I0ecfddf0f70ea5810df52d9ca8637f483a26df2f
Reviewed-on: https://gerrit.libreoffice.org/14677
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
Tested-by: Stephan Bergmann <sberg...@redhat.com>

diff --git a/offapi/com/sun/star/task/DocumentMSPasswordRequest.idl 
b/offapi/com/sun/star/task/DocumentMSPasswordRequest.idl
index 9df88fa..a7a95a9 100644
--- a/offapi/com/sun/star/task/DocumentMSPasswordRequest.idl
+++ b/offapi/com/sun/star/task/DocumentMSPasswordRequest.idl
@@ -37,7 +37,7 @@ module com { module sun { module star { module task {
 */
 published exception DocumentMSPasswordRequest: PasswordRequest
 {
-/** the name of the document
+/** the name of the document (more properly, the URL of the document)
 */
 string Name;
 
diff --git a/offapi/com/sun/star/task/DocumentPasswordRequest.idl 
b/offapi/com/sun/star/task/DocumentPasswordRequest.idl
index 762dd4a..0829d24 100644
--- a/offapi/com/sun/star/task/DocumentPasswordRequest.idl
+++ b/offapi/com/sun/star/task/DocumentPasswordRequest.idl
@@ -37,7 +37,7 @@ module com { module sun { module star { module task {
 */
 published exception DocumentPasswordRequest: PasswordRequest
 {
-/** the name of the document
+/** the name of the document (more properly, the URL of the document)
 */
 string Name;
 
diff --git a/sc/source/filter/ftools/fapihelper.cxx 
b/sc/source/filter/ftools/fapihelper.cxx
index 210215c..121491a 100644
--- a/sc/source/filter/ftools/fapihelper.cxx
+++ b/sc/source/filter/ftools/fapihelper.cxx
@@ -114,7 +114,7 @@ uno::Sequence< beans::NamedValue > 
ScfApiHelper::QueryEncryptionDataForMedium( S
 if ( pPasswordItem )
 aPassword = pPasswordItem->GetValue();
 
-OUString aDocName = INetURLObject( rMedium.GetOrigURL() ).GetName( 
INetURLObject::DECODE_WITH_CHARSET );
+OUString aDocName = rMedium.GetOrigURL();
 
 bool bIsDefaultPassword = false;
 aEncryptionData = 
::comphelper::DocPasswordHelper::requestAndVerifyDocPassword(
diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx
index 3cddd76..04c729e 100644
--- a/sfx2/source/appl/appopen.cxx
+++ b/sfx2/source/appl/appopen.cxx
@@ -241,7 +241,7 @@ sal_uInt32 CheckPasswd_Impl
 if ( pEncryptionDataItem )
 pEncryptionDataItem->GetValue() >>= 
aEncryptionData;
 
-OUString aDocumentName = INetURLObject( 
pFile->GetOrigURL() ).GetMainURL( INetURLObject::DECODE_WITH_CHARSET );
+OUString aDocumentName = pFile->GetOrigURL();
 
 SfxDocPasswordVerifier aVerifier( xStorage );
 aEncryptionData = 
::comphelper::DocPasswordHelper::requestAndVerifyDocPassword(
diff --git a/uui/source/passworddlg.cxx b/uui/source/passworddlg.cxx
index 3485a3c..4831bd3 100644
--- a/uui/source/passworddlg.cxx
+++ b/uui/source/passworddlg.cxx
@@ -20,6 +20,7 @@
 #include "passworddlg.hxx"
 #include "ids.hrc"
 
+#include 
 #include 
 
 using namespace ::com::sun::star;
@@ -71,8 +72,10 @@ PasswordDialog::PasswordDialog(vcl::Window* _pParent,
 SetText( aTitle );
 
 sal_uInt16 nStrId = bOpenToModify ? STR_ENTER_PASSWORD_TO_MODIFY : 
STR_ENTER_PASSWORD_TO_OPEN;
-m_pFTPassword->SetText(ResId(nStrId, *pResourceMgr).toString());
-m_pFTPassword->SetText( m_pFTPassword->GetText() + aDocURL );
+OUString aMessage(ResId(nStrId, *pResourceMgr).toString());
+aMessage += 
INetURLObject(aDocURL).GetMainURL(INetURLObject::DECODE_UNAMBIGUOUS);
+m_pFTPassword->SetText(aMessage);
+
 if (bIsSimplePasswordRequest)
 {
 DBG_ASSERT( aDocURL.isEmpty(), &qu

[Libreoffice-commits] core.git: g

[Tomofumi Yagi]

 g |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 125f06dbf73c287c3559acbb3096330b5e75135b
Author: Tomofumi Yagi ya...@mknada.sakura.ne.jp
Date:   Mon Jun 15 21:20:19 2015 +0900

'g' doesn't work correctly when config_host.mk contains non-ascii 
characters.

In 'g' shell script, we use grep to get substring from config_host.mk file.
When config_host.mk file contains non-ascii characters(e.g. Japanese),
this processing doesn't work.
As a result, some variables(SUBMODULES_CONFIGURED, REFERENCED_GIT, 
LINKED_GIT) will be
assigned to Binary file (standard input) matches.
This is an error message of grep.
The problem will reproduce on Cygwin64 with Japanese locale.

With '-a' option, grep will work well, and 'g' shell script will work 
correctly.

Please refer the following commit,too.

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

Change-Id: If4e0b356173c8f442e3539ed343f441d87dbfd48
Reviewed-on: https://gerrit.libreoffice.org/16344
Tested-by: Jenkins c...@libreoffice.org
Reviewed-by: Michael Stahl mst...@redhat.com

diff --git a/g b/g
index 2db87cf..423a200 100755
--- a/g
+++ b/g
@@ -147,7 +147,7 @@ get_configured_submodules()
 {
 SUBMODULES_CONFIGURED=
 if [ -f config_host.mk ] ; then
-   SUBMODULES_CONFIGURED=$(cat config_host.mk | grep GIT_NEEDED_SUBMODULES 
| sed -e s/.*=//)
+   SUBMODULES_CONFIGURED=$(cat config_host.mk | grep -a 
GIT_NEEDED_SUBMODULES | sed -e s/.*=//)
 else
# if we need the configured submoduel before the configuration is done. 
we assumed you want them all
SUBMODULES_CONFIGURED=${SUBMODULES_ALL?}
@@ -158,11 +158,11 @@ get_git_reference()
 {
 REFERENCED_GIT=
 if [ -f config_host.mk ]; then
-   REFERENCED_GIT=$(cat config_host.mk | grep GIT_REFERENCE_SRC | sed -e 
s/.*=//)
+   REFERENCED_GIT=$(cat config_host.mk | grep -a GIT_REFERENCE_SRC | sed 
-e s/.*=//)
 fi
 LINKED_GIT=
 if [ -f config_host.mk ]; then
-   LINKED_GIT=$(cat config_host.mk | grep GIT_LINK_SRC | sed -e s/.*=//)
+   LINKED_GIT=$(cat config_host.mk | grep -a GIT_LINK_SRC | sed -e 
s/.*=//)
 fi
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tomofumi Yagi]

 vcl/source/window/toolbox.cxx |   13 -
 1 file changed, 12 insertions(+), 1 deletion(-)

New commits:
commit c7efcb1340ceee35fe3b8ffd9ed86b8cae57d9ce
Author: Tomofumi Yagi ya...@mknada.sakura.ne.jp
Date:   Sat Feb 14 22:10:36 2015 +0900

tdf#83099 fix Top of formula bar is missing when expanding on Windows 7

This is workaround patch.

ToolBox::ImplFormat() method places it to the new position, when the new
item is added.
ToolBox::ImplFormat() method determines whether or not the item is newly
added, using that the new item's Top Coordinate is 0.
However, it seems that the non-new item's Top Coordinate is 0 on Windows 7
with default(aero) theme, using small icons.
We also need to consider in this case.

Change-Id: I35cf81502799432f63e0920219fcbaac9050d81f
Reviewed-on: https://gerrit.libreoffice.org/14538
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com

diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index bd64166..1a6179e 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -2492,7 +2492,15 @@ void ToolBox::ImplFormat( bool bResize )
 // items here. ( Note: assume mnMaxItemHeight is
 // equal to the LineSize when multibar has a single
 // line size )
-it-maCalcRect.Top()  =  it-maRect.Top() ? 
it-maRect.Top() : ( nY + ( mnMaxItemHeight-aCurrentItemSize.Height())/2 );
+if ( it-maRect.Top() ||
+ (it-mpWindow  it-mpWindow-GetType() == 
WINDOW_CALCINPUTLINE) ) // tdf#83099
+{
+it-maCalcRect.Top()  = it-maRect.Top();
+}
+else
+{
+it-maCalcRect.Top()  = 
nY+(mnMaxItemHeight-aCurrentItemSize.Height())/2;
+}
 }
 else
 it-maCalcRect.Top()  = 
nY+(nLineSize-aCurrentItemSize.Height())/2;
@@ -2516,6 +2524,9 @@ void ToolBox::ImplFormat( bool bResize )
 if ( it-mbShowWindow )
 {
 Point aPos( it-maCalcRect.Left(), 
it-maCalcRect.Top() );
+
+assert( it-maCalcRect.Top() = 0 );
+
 it-mpWindow-SetPosPixel( aPos );
 if ( !mbCustomizeMode )
 it-mpWindow-Show();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: g

[Tomofumi Yagi]

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

New commits:
commit 0293ec98c92fd58a592f7dd86fbbf47e7b9195c6
Author: Tomofumi Yagi ya...@mknada.sakura.ne.jp
Date:   Sat Feb 14 19:21:57 2015 +0900

g: SRC_ROOT may not contain path string in a localized environment

When config_host.mk contains non-ascii characters(e.g. Japanese ),
SRC_ROOT may contain an error message Binary file (standard input)
 matches) from grep, and SRC_ROOT may not contain path string.
With '-a' option, grep will work well.

Change-Id: Ifaada5f5a11939d624460cd8dcc57d93911ae790
Reviewed-on: https://gerrit.libreoffice.org/14491
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com

diff --git a/g b/g
index bd4270a..2db87cf 100755
--- a/g
+++ b/g
@@ -12,7 +12,7 @@ SUBMODULES_ALL=dictionaries helpcontent2 translations
 pushd $(dirname $0)  /dev/null
 if [ -f config_host.mk ] ; then
 # we are in the BUILDDIR
-SRC_ROOT=$(cat config_host.mk | grep SRC_ROOT | sed -e s/.*=//)
+SRC_ROOT=$(cat config_host.mk | grep -a SRC_ROOT | sed -e s/.*=//)
 else
 SRC_ROOT=$(pwd)
 fi
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tomofumi Yagi]

 unotools/source/misc/fontdefs.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 2ce0432345033701200a92f662ce6b989d1319cb
Author: Tomofumi Yagi ya...@mknada.sakura.ne.jp
Date:   Thu Jan 29 20:12:47 2015 +0900

fix tdf#88855: GetEnglishSearchFontName() returns incorrect value.

GetEnglishSearchFontName() returns incorrect value for specific localized
font name as parameter(ex.HGS Gothic M).
Because, the conversion table aImplLocalizedNamesList[] is wrong.


http://opengrok.libreoffice.org/xref/core/unotools/source/misc/fontdefs.cxx#181

This causes the assertion from 
vcl/source/font/PhysicalFontFamily.cxx(line:297),
and more problems, probably.

This patch fixes two entries in the conversion table.
One fixes the assertion, another fixes typo.

Change-Id: I31417956608cc59f20ad42c76ef97a42189d
Reviewed-on: https://gerrit.libreoffice.org/14244
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
(cherry picked from commit c8c4e766643c8ad0a3d6d48e5105518ef5f66250)
Reviewed-on: https://gerrit.libreoffice.org/14256
Tested-by: Michael Stahl mst...@redhat.com
Reviewed-by: Michael Stahl mst...@redhat.com

diff --git a/unotools/source/misc/fontdefs.cxx 
b/unotools/source/misc/fontdefs.cxx
index 133d77a..3788161 100644
--- a/unotools/source/misc/fontdefs.cxx
+++ b/unotools/source/misc/fontdefs.cxx
@@ -284,10 +284,10 @@ static ImplLocalizedFontName aImplLocalizedNamesList[] =
 {   mdeasop,  aMDEasop },
 {   hggothice,aHGGothicE },
 {   hgpgothice,   aHGPGothicE },
-{   hgpothice,aHGSGothicE },
+{   hgsgothice,   aHGSGothicE },
 {   hggothicm,aHGGothicM },
 {   hgpgothicm,   aHGPGothicM },
-{   hgpgothicm,   aHGSGothicM },
+{   hgsgothicm,   aHGSGothicM },
 {   hggyoshotai,  aHGGyoshotai },
 {   hgpgyoshotai, aHGPGyoshotai },
 {   hgsgyoshotai, aHGSGyoshotai },
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - unotools/source

[Tomofumi Yagi]

 unotools/source/misc/fontdefs.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit df967d58b8e7aa640370819c1d4c5728f937c39d
Author: Tomofumi Yagi ya...@mknada.sakura.ne.jp
Date:   Thu Jan 29 20:12:47 2015 +0900

fix tdf#88855: GetEnglishSearchFontName() returns incorrect value.

GetEnglishSearchFontName() returns incorrect value for specific localized
font name as parameter(ex.HGS Gothic M).
Because, the conversion table aImplLocalizedNamesList[] is wrong.


http://opengrok.libreoffice.org/xref/core/unotools/source/misc/fontdefs.cxx#181

This causes the assertion from 
vcl/source/font/PhysicalFontFamily.cxx(line:297),
and more problems, probably.

This patch fixes two entries in the conversion table.
One fixes the assertion, another fixes typo.

Change-Id: I31417956608cc59f20ad42c76ef97a42189d
Reviewed-on: https://gerrit.libreoffice.org/14244
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
(cherry picked from commit c8c4e766643c8ad0a3d6d48e5105518ef5f66250)
Reviewed-on: https://gerrit.libreoffice.org/14317
Tested-by: Michael Stahl mst...@redhat.com
Reviewed-by: Michael Stahl mst...@redhat.com

diff --git a/unotools/source/misc/fontdefs.cxx 
b/unotools/source/misc/fontdefs.cxx
index 61f6a07..38cfdcf 100644
--- a/unotools/source/misc/fontdefs.cxx
+++ b/unotools/source/misc/fontdefs.cxx
@@ -284,10 +284,10 @@ static ImplLocalizedFontName aImplLocalizedNamesList[] =
 {   mdeasop,  aMDEasop },
 {   hggothice,aHGGothicE },
 {   hgpgothice,   aHGPGothicE },
-{   hgpothice,aHGSGothicE },
+{   hgsgothice,   aHGSGothicE },
 {   hggothicm,aHGGothicM },
 {   hgpgothicm,   aHGPGothicM },
-{   hgpgothicm,   aHGSGothicM },
+{   hgsgothicm,   aHGSGothicM },
 {   hggyoshotai,  aHGGyoshotai },
 {   hgpgyoshotai, aHGPGyoshotai },
 {   hgsgyoshotai, aHGSGyoshotai },
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - unotools/source

[Tomofumi Yagi]

 unotools/source/misc/fontdefs.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 6e4e936d9bffbe7f890809b722a74cd7f95106a8
Author: Tomofumi Yagi ya...@mknada.sakura.ne.jp
Date:   Thu Jan 29 20:12:47 2015 +0900

fix tdf#88855: GetEnglishSearchFontName() returns incorrect value.

GetEnglishSearchFontName() returns incorrect value for specific localized
font name as parameter(ex.HGS Gothic M).
Because, the conversion table aImplLocalizedNamesList[] is wrong.


http://opengrok.libreoffice.org/xref/core/unotools/source/misc/fontdefs.cxx#181

This causes the assertion from 
vcl/source/font/PhysicalFontFamily.cxx(line:297),
and more problems, probably.

This patch fixes two entries in the conversion table.
One fixes the assertion, another fixes typo.

Change-Id: I31417956608cc59f20ad42c76ef97a42189d
Reviewed-on: https://gerrit.libreoffice.org/14244
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
(cherry picked from commit c8c4e766643c8ad0a3d6d48e5105518ef5f66250)
Reviewed-on: https://gerrit.libreoffice.org/14262
Reviewed-by: Andras Timar andras.ti...@collabora.com
Tested-by: Andras Timar andras.ti...@collabora.com

diff --git a/unotools/source/misc/fontdefs.cxx 
b/unotools/source/misc/fontdefs.cxx
index cdb8bd6..a5fd5ff 100644
--- a/unotools/source/misc/fontdefs.cxx
+++ b/unotools/source/misc/fontdefs.cxx
@@ -284,10 +284,10 @@ static ImplLocalizedFontName aImplLocalizedNamesList[] =
 {   mdeasop,  aMDEasop },
 {   hggothice,aHGGothicE },
 {   hgpgothice,   aHGPGothicE },
-{   hgpothice,aHGSGothicE },
+{   hgsgothice,   aHGSGothicE },
 {   hggothicm,aHGGothicM },
 {   hgpgothicm,   aHGPGothicM },
-{   hgpgothicm,   aHGSGothicM },
+{   hgsgothicm,   aHGSGothicM },
 {   hggyoshotai,  aHGGyoshotai },
 {   hgpgyoshotai, aHGPGyoshotai },
 {   hgsgyoshotai, aHGSGyoshotai },
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.3' - unotools/source

[Tomofumi Yagi]

 unotools/source/misc/fontdefs.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a7a039e77221ac0c330e6265634371de70fc470d
Author: Tomofumi Yagi ya...@mknada.sakura.ne.jp
Date:   Thu Jan 29 20:12:47 2015 +0900

fix tdf#88855: GetEnglishSearchFontName() returns incorrect value.

GetEnglishSearchFontName() returns incorrect value for specific localized
font name as parameter(ex.HGS Gothic M).
Because, the conversion table aImplLocalizedNamesList[] is wrong.


http://opengrok.libreoffice.org/xref/core/unotools/source/misc/fontdefs.cxx#181

This causes the assertion from 
vcl/source/font/PhysicalFontFamily.cxx(line:297),
and more problems, probably.

This patch fixes two entries in the conversion table.
One fixes the assertion, another fixes typo.

Change-Id: I31417956608cc59f20ad42c76ef97a42189d
Reviewed-on: https://gerrit.libreoffice.org/14244
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
(cherry picked from commit c8c4e766643c8ad0a3d6d48e5105518ef5f66250)
Reviewed-on: https://gerrit.libreoffice.org/14263
Reviewed-by: Andras Timar andras.ti...@collabora.com
Tested-by: Andras Timar andras.ti...@collabora.com

diff --git a/unotools/source/misc/fontdefs.cxx 
b/unotools/source/misc/fontdefs.cxx
index 61f6a07..38cfdcf 100644
--- a/unotools/source/misc/fontdefs.cxx
+++ b/unotools/source/misc/fontdefs.cxx
@@ -284,10 +284,10 @@ static ImplLocalizedFontName aImplLocalizedNamesList[] =
 {   mdeasop,  aMDEasop },
 {   hggothice,aHGGothicE },
 {   hgpgothice,   aHGPGothicE },
-{   hgpothice,aHGSGothicE },
+{   hgsgothice,   aHGSGothicE },
 {   hggothicm,aHGGothicM },
 {   hgpgothicm,   aHGPGothicM },
-{   hgpgothicm,   aHGSGothicM },
+{   hgsgothicm,   aHGSGothicM },
 {   hggyoshotai,  aHGGyoshotai },
 {   hgpgyoshotai, aHGPGyoshotai },
 {   hgsgyoshotai, aHGSGyoshotai },
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tomofumi Yagi]

 unotools/source/misc/fontdefs.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit c8c4e766643c8ad0a3d6d48e5105518ef5f66250
Author: Tomofumi Yagi ya...@mknada.sakura.ne.jp
Date:   Thu Jan 29 20:12:47 2015 +0900

fix tdf#88855: GetEnglishSearchFontName() returns incorrect value.

GetEnglishSearchFontName() returns incorrect value for specific localized
font name as parameter(ex.HGS Gothic M).
Because, the conversion table aImplLocalizedNamesList[] is wrong.


http://opengrok.libreoffice.org/xref/core/unotools/source/misc/fontdefs.cxx#181

This causes the assertion from 
vcl/source/font/PhysicalFontFamily.cxx(line:297),
and more problems, probably.

This patch fixes two entries in the conversion table.
One fixes the assertion, another fixes typo.

Change-Id: I31417956608cc59f20ad42c76ef97a42189d
Reviewed-on: https://gerrit.libreoffice.org/14244
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com

diff --git a/unotools/source/misc/fontdefs.cxx 
b/unotools/source/misc/fontdefs.cxx
index 04c6fc4..9d3e2c7 100644
--- a/unotools/source/misc/fontdefs.cxx
+++ b/unotools/source/misc/fontdefs.cxx
@@ -284,10 +284,10 @@ static ImplLocalizedFontName aImplLocalizedNamesList[] =
 {   mdeasop,  aMDEasop },
 {   hggothice,aHGGothicE },
 {   hgpgothice,   aHGPGothicE },
-{   hgpothice,aHGSGothicE },
+{   hgsgothice,   aHGSGothicE },
 {   hggothicm,aHGGothicM },
 {   hgpgothicm,   aHGPGothicM },
-{   hgpgothicm,   aHGSGothicM },
+{   hgsgothicm,   aHGSGothicM },
 {   hggyoshotai,  aHGGyoshotai },
 {   hgpgyoshotai, aHGPGyoshotai },
 {   hgsgyoshotai, aHGSGyoshotai },
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - officecfg/registry

[Tomofumi Yagi]

 officecfg/registry/data/org/openoffice/VCL.xcu |   16 
 1 file changed, 8 insertions(+), 8 deletions(-)

New commits:
commit ad3da3ba08e71bee199defaf28bbe485ceae2209
Author: Tomofumi Yagi ya...@mknada.sakura.ne.jp
Date:   Sat Nov 15 20:26:15 2014 +0900

fdo#77971 Writer:Better font selection in Japanese locale on Mac OSX.

This patch resolves the problem that Basic fonts(Asian) are Arial
Unicode MS in Japanese locale on Mac OSX.
Expected behavior is that Basic fonts(Asian) are Hiragino Mincho ProN
font.

LibreOffice 4.1 and later, on Mac OS X, the font family names are kept
without suffix(e.g. w3, w6) in the system font list.
Some font names in VCL.xcu (font family name including the weight
as suffix) doesn't match the font name kept in the system font list.

This problem reproduces at the CJK fonts environment.
This patch resolves this problem with Japanese fonts environment only.

Change-Id: Iaf3eb2225fbc6375d1911976ac40a4d8f2fa0590
Reviewed-on: https://gerrit.libreoffice.org/12455
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
Reviewed-on: https://gerrit.libreoffice.org/12458
Reviewed-by: Andras Timar andras.ti...@collabora.com
Tested-by: Andras Timar andras.ti...@collabora.com

diff --git a/officecfg/registry/data/org/openoffice/VCL.xcu 
b/officecfg/registry/data/org/openoffice/VCL.xcu
index ec48498..457ac10 100644
--- a/officecfg/registry/data/org/openoffice/VCL.xcu
+++ b/officecfg/registry/data/org/openoffice/VCL.xcu
@@ -212,31 +212,31 @@
 /node
 node oor:name=ja oor:op=replace
   prop oor:name=CJK_TEXT oor:type=xs:string oor:op=replace
-valueHG 明朝L Sun;HG MinchoL Sun;HG PゴシックB Sun;HG-PGothicB 
Sun;HG PゴシックB;HG-PGothicB;HG Mincho Light J;ＭＳ 
Ｐ明朝;ヒラギノ明朝 ProN W3;ヒラギノ明朝 Pro W3;UmePlus P 
Gothic;TLP明朝;LX明朝;HGPMinchoL;IPA P明朝;東風明朝;Kochi 
Mincho;さざなみ明朝;Mincho;Serif/value
+valueHG 明朝L Sun;HG MinchoL Sun;HG PゴシックB Sun;HG-PGothicB 
Sun;HG PゴシックB;HG-PGothicB;HG Mincho Light J;ＭＳ 
Ｐ明朝;ヒラギノ明朝 ProN;ヒラギノ明朝 Pro;UmePlus P 
Gothic;TLP明朝;LX明朝;HGPMinchoL;IPA P明朝;東風明朝;Kochi 
Mincho;さざなみ明朝;Mincho;Serif/value
   /prop
   prop oor:name=CJK_HEADING oor:type=xs:string oor:op=replace
-valueHG 明朝L Sun;HG 明朝L;HG Mincho Light J;ＭＳ 
Ｐゴシック;ヒラギノ角ゴ ProN W3;ヒラギノ角ゴ Pro 
W3;TLPゴシック;LXゴシック;HGPGothicB;IPA 
Pゴシック;東風ゴシック;さざなみゴシック;Gothic;ＭＳ 
明朝;HG Mincho J;HG Mincho L;HG Mincho;Mincho;ＭＳ Ｐ明朝;HG Mincho 
Light J;ＭＳ ゴシック;HG Gothic J;HG Gothic B;HG Gothic;Gothic;ＭＳ 
Ｐゴシック;UmePlus P Gothic/value
+valueHG 明朝L Sun;HG 明朝L;HG Mincho Light J;ＭＳ 
Ｐゴシック;ヒラギノ角ゴ ProN;ヒラギノ角ゴ 
Pro;TLPゴシック;LXゴシック;HGPGothicB;IPA 
Pゴシック;東風ゴシック;さざなみゴシック;Gothic;ＭＳ 
明朝;HG Mincho J;HG Mincho L;HG Mincho;Mincho;ＭＳ Ｐ明朝;HG Mincho 
Light J;ＭＳ ゴシック;HG Gothic J;HG Gothic B;HG Gothic;Gothic;ＭＳ 
Ｐゴシック;UmePlus P Gothic/value
   /prop
   prop oor:name=CJK_PRESENTATION oor:type=xs:string oor:op=replace
-valueHG PゴシックB Sun;HG-PGothicB Sun;HG 
PゴシックB;ヒラギノ明朝 ProN W3;ヒラギノ明朝 Pro 
W3;HG-PGothicB;HG-GothicB;HG Mincho Light J;ï¼­ï¼³ 
Ｐゴシック;TLPゴシック;LXゴシック;HGPGothicB;IPA 
Pゴシック;東風ゴシック;さざなみゴシック;ＭＳ 
ゴシック;ＭＳ Ｐゴシック;HG Gothic;HG Gothic B;UmePlus P 
Gothic;Gothic/value
+valueHG PゴシックB Sun;HG-PGothicB Sun;HG 
PゴシックB;ヒラギノ明朝 ProN;ヒラギノ明朝 
Pro;HG-PGothicB;HG-GothicB;HG Mincho Light J;ï¼­ï¼³ 
Ｐゴシック;TLPゴシック;LXゴシック;HGPGothicB;IPA 
Pゴシック;東風ゴシック;さざなみゴシック;ＭＳ 
ゴシック;ＭＳ Ｐゴシック;HG Gothic;HG Gothic B;UmePlus P 
Gothic;Gothic/value
   /prop
   prop oor:name=LATIN_PRESENTATION oor:type=xs:string 
oor:op=replace
 valueAndale;Arial/value
   /prop
   prop oor:name=CJK_SPREADSHEET oor:type=xs:string oor:op=replace
-valueHG PゴシックB Sun;HG-PGothicB Sun;HG 
PゴシックB;HG-PGothicB;ＭＳ Ｐゴシック;ヒラギノ角ゴ ProN 
W3;ヒラギノ角ゴ Pro W3;TLPゴシック;LXゴシック;ヒラギノ明朝 
ProN W3;ヒラギノ明朝 Pro W3;HGPGothicB;IPA 
Pゴシック;東風ゴシック;さざなみゴシック;UmePlus P 
Gothic;Kochi Gothic;HG Gothic J;HG Gothic B;HG Gothic;Gothic/value
+valueHG PゴシックB Sun;HG-PGothicB Sun;HG 
PゴシックB;HG-PGothicB;ＭＳ Ｐゴシック;ヒラギノ角ゴ 
ProN;ヒラギノ角ゴ Pro;TLPゴシック;LXゴシã

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - 4 commits - basic/source editeng/source officecfg/registry svx/source

[Tomofumi Yagi]

 basic/source/runtime/methods.cxx   |5 +-
 editeng/source/editeng/editdoc.cxx |2 -
 officecfg/registry/data/org/openoffice/VCL.xcu |   16 
 svx/source/table/tablecontroller.cxx   |   46 +
 4 files changed, 45 insertions(+), 24 deletions(-)

New commits:
commit ae09c6f74b9a18d7d1ef2c51535f327ae3e2d3d1
Author: Tomofumi Yagi ya...@mknada.sakura.ne.jp
Date:   Sat Nov 15 20:26:15 2014 +0900

fdo#77971 Writer:Better font selection in Japanese locale on Mac OSX.

This patch resolves the problem that Basic fonts(Asian) are Arial
Unicode MS in Japanese locale on Mac OSX.
Expected behavior is that Basic fonts(Asian) are Hiragino Mincho ProN
font.

LibreOffice 4.1 and later, on Mac OS X, the font family names are kept
without suffix(e.g. w3, w6) in the system font list.
Some font names in VCL.xcu (font family name including the weight
as suffix) doesn't match the font name kept in the system font list.

This problem reproduces at the CJK fonts environment.
This patch resolves this problem with Japanese fonts environment only.

Change-Id: Iaf3eb2225fbc6375d1911976ac40a4d8f2fa0590
Reviewed-on: https://gerrit.libreoffice.org/12455
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com

diff --git a/officecfg/registry/data/org/openoffice/VCL.xcu 
b/officecfg/registry/data/org/openoffice/VCL.xcu
index ec48498..457ac10 100644
--- a/officecfg/registry/data/org/openoffice/VCL.xcu
+++ b/officecfg/registry/data/org/openoffice/VCL.xcu
@@ -212,31 +212,31 @@
 /node
 node oor:name=ja oor:op=replace
   prop oor:name=CJK_TEXT oor:type=xs:string oor:op=replace
-valueHG 明朝L Sun;HG MinchoL Sun;HG PゴシックB Sun;HG-PGothicB 
Sun;HG PゴシックB;HG-PGothicB;HG Mincho Light J;ＭＳ 
Ｐ明朝;ヒラギノ明朝 ProN W3;ヒラギノ明朝 Pro W3;UmePlus P 
Gothic;TLP明朝;LX明朝;HGPMinchoL;IPA P明朝;東風明朝;Kochi 
Mincho;さざなみ明朝;Mincho;Serif/value
+valueHG 明朝L Sun;HG MinchoL Sun;HG PゴシックB Sun;HG-PGothicB 
Sun;HG PゴシックB;HG-PGothicB;HG Mincho Light J;ＭＳ 
Ｐ明朝;ヒラギノ明朝 ProN;ヒラギノ明朝 Pro;UmePlus P 
Gothic;TLP明朝;LX明朝;HGPMinchoL;IPA P明朝;東風明朝;Kochi 
Mincho;さざなみ明朝;Mincho;Serif/value
   /prop
   prop oor:name=CJK_HEADING oor:type=xs:string oor:op=replace
-valueHG 明朝L Sun;HG 明朝L;HG Mincho Light J;ＭＳ 
Ｐゴシック;ヒラギノ角ゴ ProN W3;ヒラギノ角ゴ Pro 
W3;TLPゴシック;LXゴシック;HGPGothicB;IPA 
Pゴシック;東風ゴシック;さざなみゴシック;Gothic;ＭＳ 
明朝;HG Mincho J;HG Mincho L;HG Mincho;Mincho;ＭＳ Ｐ明朝;HG Mincho 
Light J;ＭＳ ゴシック;HG Gothic J;HG Gothic B;HG Gothic;Gothic;ＭＳ 
Ｐゴシック;UmePlus P Gothic/value
+valueHG 明朝L Sun;HG 明朝L;HG Mincho Light J;ＭＳ 
Ｐゴシック;ヒラギノ角ゴ ProN;ヒラギノ角ゴ 
Pro;TLPゴシック;LXゴシック;HGPGothicB;IPA 
Pゴシック;東風ゴシック;さざなみゴシック;Gothic;ＭＳ 
明朝;HG Mincho J;HG Mincho L;HG Mincho;Mincho;ＭＳ Ｐ明朝;HG Mincho 
Light J;ＭＳ ゴシック;HG Gothic J;HG Gothic B;HG Gothic;Gothic;ＭＳ 
Ｐゴシック;UmePlus P Gothic/value
   /prop
   prop oor:name=CJK_PRESENTATION oor:type=xs:string oor:op=replace
-valueHG PゴシックB Sun;HG-PGothicB Sun;HG 
PゴシックB;ヒラギノ明朝 ProN W3;ヒラギノ明朝 Pro 
W3;HG-PGothicB;HG-GothicB;HG Mincho Light J;ï¼­ï¼³ 
Ｐゴシック;TLPゴシック;LXゴシック;HGPGothicB;IPA 
Pゴシック;東風ゴシック;さざなみゴシック;ＭＳ 
ゴシック;ＭＳ Ｐゴシック;HG Gothic;HG Gothic B;UmePlus P 
Gothic;Gothic/value
+valueHG PゴシックB Sun;HG-PGothicB Sun;HG 
PゴシックB;ヒラギノ明朝 ProN;ヒラギノ明朝 
Pro;HG-PGothicB;HG-GothicB;HG Mincho Light J;ï¼­ï¼³ 
Ｐゴシック;TLPゴシック;LXゴシック;HGPGothicB;IPA 
Pゴシック;東風ゴシック;さざなみゴシック;ＭＳ 
ゴシック;ＭＳ Ｐゴシック;HG Gothic;HG Gothic B;UmePlus P 
Gothic;Gothic/value
   /prop
   prop oor:name=LATIN_PRESENTATION oor:type=xs:string 
oor:op=replace
 valueAndale;Arial/value
   /prop
   prop oor:name=CJK_SPREADSHEET oor:type=xs:string oor:op=replace
-valueHG PゴシックB Sun;HG-PGothicB Sun;HG 
PゴシックB;HG-PGothicB;ＭＳ Ｐゴシック;ヒラギノ角ゴ ProN 
W3;ヒラギノ角ゴ Pro W3;TLPゴシック;LXゴシック;ヒラギノ明朝 
ProN W3;ヒラギノ明朝 Pro W3;HGPGothicB;IPA 
Pゴシック;東風ゴシック;さざなみゴシック;UmePlus P 
Gothic;Kochi Gothic;HG Gothic J;HG Gothic B;HG Gothic;Gothic/value
+valueHG PゴシックB Sun;HG-PGothicB Sun;HG 
PゴシックB;HG-PGothicB;ＭＳ Ｐゴシック;ヒラギノ角ゴ 
ProN;ヒラギノ角ゴ Pro

[Libreoffice-commits] core.git: officecfg/registry

[Tomofumi Yagi]

 officecfg/registry/data/org/openoffice/VCL.xcu |   16 
 1 file changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 735a1a17648071eee91099d73ef0a8000edf134f
Author: Tomofumi Yagi ya...@mknada.sakura.ne.jp
Date:   Sat Nov 15 20:26:15 2014 +0900

fdo#77971 Writer:Better font selection in Japanese locale on Mac OSX.

This patch resolves the problem that Basic fonts(Asian) are Arial
Unicode MS in Japanese locale on Mac OSX.
Expected behavior is that Basic fonts(Asian) are Hiragino Mincho ProN
font.

LibreOffice 4.1 and later, on Mac OS X, the font family names are kept
without suffix(e.g. w3, w6) in the system font list.
Some font names in VCL.xcu (font family name including the weight
as suffix) doesn't match the font name kept in the system font list.

This problem reproduces at the CJK fonts environment.
This patch resolves this problem with Japanese fonts environment only.

Change-Id: Iaf3eb2225fbc6375d1911976ac40a4d8f2fa0590
Reviewed-on: https://gerrit.libreoffice.org/12455
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com

diff --git a/officecfg/registry/data/org/openoffice/VCL.xcu 
b/officecfg/registry/data/org/openoffice/VCL.xcu
index ec48498..457ac10 100644
--- a/officecfg/registry/data/org/openoffice/VCL.xcu
+++ b/officecfg/registry/data/org/openoffice/VCL.xcu
@@ -212,31 +212,31 @@
 /node
 node oor:name=ja oor:op=replace
   prop oor:name=CJK_TEXT oor:type=xs:string oor:op=replace
-valueHG 明朝L Sun;HG MinchoL Sun;HG PゴシックB Sun;HG-PGothicB 
Sun;HG PゴシックB;HG-PGothicB;HG Mincho Light J;ＭＳ 
Ｐ明朝;ヒラギノ明朝 ProN W3;ヒラギノ明朝 Pro W3;UmePlus P 
Gothic;TLP明朝;LX明朝;HGPMinchoL;IPA P明朝;東風明朝;Kochi 
Mincho;さざなみ明朝;Mincho;Serif/value
+valueHG 明朝L Sun;HG MinchoL Sun;HG PゴシックB Sun;HG-PGothicB 
Sun;HG PゴシックB;HG-PGothicB;HG Mincho Light J;ＭＳ 
Ｐ明朝;ヒラギノ明朝 ProN;ヒラギノ明朝 Pro;UmePlus P 
Gothic;TLP明朝;LX明朝;HGPMinchoL;IPA P明朝;東風明朝;Kochi 
Mincho;さざなみ明朝;Mincho;Serif/value
   /prop
   prop oor:name=CJK_HEADING oor:type=xs:string oor:op=replace
-valueHG 明朝L Sun;HG 明朝L;HG Mincho Light J;ＭＳ 
Ｐゴシック;ヒラギノ角ゴ ProN W3;ヒラギノ角ゴ Pro 
W3;TLPゴシック;LXゴシック;HGPGothicB;IPA 
Pゴシック;東風ゴシック;さざなみゴシック;Gothic;ＭＳ 
明朝;HG Mincho J;HG Mincho L;HG Mincho;Mincho;ＭＳ Ｐ明朝;HG Mincho 
Light J;ＭＳ ゴシック;HG Gothic J;HG Gothic B;HG Gothic;Gothic;ＭＳ 
Ｐゴシック;UmePlus P Gothic/value
+valueHG 明朝L Sun;HG 明朝L;HG Mincho Light J;ＭＳ 
Ｐゴシック;ヒラギノ角ゴ ProN;ヒラギノ角ゴ 
Pro;TLPゴシック;LXゴシック;HGPGothicB;IPA 
Pゴシック;東風ゴシック;さざなみゴシック;Gothic;ＭＳ 
明朝;HG Mincho J;HG Mincho L;HG Mincho;Mincho;ＭＳ Ｐ明朝;HG Mincho 
Light J;ＭＳ ゴシック;HG Gothic J;HG Gothic B;HG Gothic;Gothic;ＭＳ 
Ｐゴシック;UmePlus P Gothic/value
   /prop
   prop oor:name=CJK_PRESENTATION oor:type=xs:string oor:op=replace
-valueHG PゴシックB Sun;HG-PGothicB Sun;HG 
PゴシックB;ヒラギノ明朝 ProN W3;ヒラギノ明朝 Pro 
W3;HG-PGothicB;HG-GothicB;HG Mincho Light J;ï¼­ï¼³ 
Ｐゴシック;TLPゴシック;LXゴシック;HGPGothicB;IPA 
Pゴシック;東風ゴシック;さざなみゴシック;ＭＳ 
ゴシック;ＭＳ Ｐゴシック;HG Gothic;HG Gothic B;UmePlus P 
Gothic;Gothic/value
+valueHG PゴシックB Sun;HG-PGothicB Sun;HG 
PゴシックB;ヒラギノ明朝 ProN;ヒラギノ明朝 
Pro;HG-PGothicB;HG-GothicB;HG Mincho Light J;ï¼­ï¼³ 
Ｐゴシック;TLPゴシック;LXゴシック;HGPGothicB;IPA 
Pゴシック;東風ゴシック;さざなみゴシック;ＭＳ 
ゴシック;ＭＳ Ｐゴシック;HG Gothic;HG Gothic B;UmePlus P 
Gothic;Gothic/value
   /prop
   prop oor:name=LATIN_PRESENTATION oor:type=xs:string 
oor:op=replace
 valueAndale;Arial/value
   /prop
   prop oor:name=CJK_SPREADSHEET oor:type=xs:string oor:op=replace
-valueHG PゴシックB Sun;HG-PGothicB Sun;HG 
PゴシックB;HG-PGothicB;ＭＳ Ｐゴシック;ヒラギノ角ゴ ProN 
W3;ヒラギノ角ゴ Pro W3;TLPゴシック;LXゴシック;ヒラギノ明朝 
ProN W3;ヒラギノ明朝 Pro W3;HGPGothicB;IPA 
Pゴシック;東風ゴシック;さざなみゴシック;UmePlus P 
Gothic;Kochi Gothic;HG Gothic J;HG Gothic B;HG Gothic;Gothic/value
+valueHG PゴシックB Sun;HG-PGothicB Sun;HG 
PゴシックB;HG-PGothicB;ＭＳ Ｐゴシック;ヒラギノ角ゴ 
ProN;ヒラギノ角ゴ Pro;TLPゴシック;LXゴシック;ヒラギノ明朝 
ProN;ヒラギノ明朝 Pro;HGPGothicB;IPA 
Pゴシック;東風ゴシック;さざなみゴシック;UmePlus P 
Gothic;Kochi Gothic;HG

[Libreoffice-commits] core.git: Changes to 'refs/changes/72/7272/1'

[Tomofumi Yagi]

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

[Libreoffice-commits] core.git: Changes to 'refs/changes/35/4935/1'

[Tomofumi Yagi]

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

[Libreoffice-commits] core.git: Changes to 'refs/changes/35/4935/2'

[Tomofumi Yagi]

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

[Libreoffice-commits] core.git: Changes to 'refs/changes/03/9103/1'

[Tomofumi Yagi]

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

[Libreoffice-commits] core.git: Changes to 'refs/changes/51/5851/3'

[Tomofumi Yagi]

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

[Libreoffice-commits] core.git: Changes to 'refs/changes/07/9107/1'

[Tomofumi Yagi]

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

[Libreoffice-commits] core.git: Changes to 'refs/changes/71/8071/3'

[Tomofumi Yagi]

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

[Libreoffice-commits] core.git: Changes to 'refs/changes/71/8071/1'

[Tomofumi Yagi]

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

[Libreoffice-commits] core.git: Changes to 'refs/changes/03/9103/2'

[Tomofumi Yagi]

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

[Libreoffice-commits] core.git: Changes to 'refs/changes/07/9107/2'

[Tomofumi Yagi]

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

[Libreoffice-commits] core.git: Changes to 'refs/changes/51/5851/1'

[Tomofumi Yagi]

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

[Libreoffice-commits] core.git: Changes to 'refs/changes/71/8071/2'

[Tomofumi Yagi]

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

[Libreoffice-commits] core.git: Changes to 'refs/changes/47/6847/2'

[Tomofumi Yagi]

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

[Libreoffice-commits] core.git: Changes to 'refs/changes/47/6847/3'

[Tomofumi Yagi]

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

[Libreoffice-commits] core.git: Changes to 'refs/changes/47/6847/1'

[Tomofumi Yagi]

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

[Libreoffice-commits] core.git: Changes to 'refs/changes/54/8854/1'

[Tomofumi Yagi]

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

[Libreoffice-commits] core.git: Changes to 'refs/changes/54/8854/2'

[Tomofumi Yagi]

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

[Libreoffice-commits] core.git: Changes to 'refs/changes/48/9248/1'

[Tomofumi Yagi]

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

[Libreoffice-commits] core.git: configure.ac

[Tomofumi Yagi]

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

New commits:
commit 7623bc31584b38da980016db25fb5dfc702beb10
Author: Tomofumi Yagi ya...@mknada.sakura.ne.jp
Date:   Sun May 4 11:34:24 2014 +0900

fix windows build(external/poppler)

Fix build error on windows with --enable-dbgutil autogen.sh option.
We need to link freetype248_D.lib,when we use --enable-dbgutil option.
(Suffix _D is needed.)

Change-Id: Ib2927e777d9b9bb615e1df62e428cf17cc8bc26e
Reviewed-on: https://gerrit.libreoffice.org/9248
Tested-by: Michael Stahl mst...@redhat.com
Reviewed-by: Michael Stahl mst...@redhat.com

diff --git a/configure.ac b/configure.ac
index 2e4e3b3..256efe9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10404,7 +10404,8 @@ if test $_os != iOS -a $_os != Android -a $_os != 
Darwin -a x$enable_gltf != 
 if test $test_freetype = no; then
 BUILD_TYPE=$BUILD_TYPE FREETYPE
 if test $COM = MSC; then
-
FREETYPE_LIBS=${WORKDIR}/UnpackedTarball/freetype/objs/win32/vc2010/freetype248.lib
+test -n ${MSVC_USE_DEBUG_RUNTIME}  
FREETYPE_LIB_DEBUGLIB_SUFFIX=_D
+
FREETYPE_LIBS=${WORKDIR}/UnpackedTarball/freetype/objs/win32/vc2010/freetype248$FREETYPE_LIB_DEBUGLIB_SUFFIX.lib
 fi
 fi
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tomofumi Yagi]

 svx/source/tbxctrls/tbcontrl.cxx |   12 
 1 file changed, 12 insertions(+)

New commits:
commit 5c31515d2e54a42ceac1b21409cb730cdbb825ed
Author: Tomofumi Yagi ya...@mknada.sakura.ne.jp
Date:   Sat Apr 19 16:52:44 2014 +0900

fdo#73891 Fix UI color panel does not show the actual color in Writer

1.The Font/Background/Highlight Color panels identify the actual color
 by a small frame.
 (Regression from the commit 35aa48d80b4b800d408d26bd72fbdfd711abbb6f
  See also fdo#32376 - Set default color to the current one in toolbar
  popups)

2.Fix this in the Floating Font/Background/Highlight Color Toolbar,too.

Change-Id: I5c2db8ab8923ab146cbf921dcb90894765f8420c
Reviewed-on: https://gerrit.libreoffice.org/9103
Reviewed-by: Kohei Yoshida libreoff...@kohei.us
Tested-by: Kohei Yoshida libreoff...@kohei.us

diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index d50e9db..2c22294 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -1138,6 +1138,17 @@ SvxColorWindow_Impl::SvxColorWindow_Impl( const 
OUStringrCommand,
 SetOutputSizePixel(Size(aNewSize.Width() + nAdd, aNewSize.Height() + 
nAdd));
 aColorSet.Clear();
 aColorSet.addEntriesForXColorList(*pColorList);
+
+short i = 0;
+long nCount = pColorList-Count();
+XColorEntry* pEntry = NULL;
+
+for ( i = 0; i  nCount; i++ )
+{
+pEntry = pColorList-GetColor(i);
+if( pEntry-GetColor() == mLastColor )
+aColorSet.SelectItem( i+1 );
+}
 }
 
 aColorSet.SetSelectHdl( LINK( this, SvxColorWindow_Impl, SelectHdl ) );
@@ -1210,6 +1221,7 @@ IMPL_LINK_NOARG(SvxColorWindow_Impl, SelectHdl)
 SfxToolBoxControl::Dispatch( Reference XDispatchProvider ( 
GetFrame()-getController(), UNO_QUERY ),
  maCommand,
  aArgs );
+aColorSet.SelectItem( nItemId );
 }
 
 return 0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - svx/source

[Tomofumi Yagi]

 svx/source/tbxctrls/tbcontrl.cxx |   12 
 1 file changed, 12 insertions(+)

New commits:
commit cf74704979090792bf083957619c8dd608e4f5c0
Author: Tomofumi Yagi ya...@mknada.sakura.ne.jp
Date:   Sat Apr 19 16:52:44 2014 +0900

fdo#73891 Fix UI color panel does not show the actual color in Writer

1.The Font/Background/Highlight Color panels identify the actual color
 by a small frame.
 (Regression from the commit 35aa48d80b4b800d408d26bd72fbdfd711abbb6f
  See also fdo#32376 - Set default color to the current one in toolbar
  popups)

2.Fix this in the Floating Font/Background/Highlight Color Toolbar,too.

Reviewed-on: https://gerrit.libreoffice.org/9103
Reviewed-by: Kohei Yoshida libreoff...@kohei.us
Tested-by: Kohei Yoshida libreoff...@kohei.us
(cherry picked from commit 5c31515d2e54a42ceac1b21409cb730cdbb825ed)

Change-Id: I5c2db8ab8923ab146cbf921dcb90894765f8420c
Signed-off-by: Kohei Yoshida kohei.yosh...@collabora.com

diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index b8f3a85..91b6a66 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -1134,6 +1134,17 @@ SvxColorWindow_Impl::SvxColorWindow_Impl( const 
OUStringrCommand,
 SetOutputSizePixel(Size(aNewSize.Width() + nAdd, aNewSize.Height() + 
nAdd));
 aColorSet.Clear();
 aColorSet.addEntriesForXColorList(*pColorList);
+
+short i = 0;
+long nCount = pColorList-Count();
+XColorEntry* pEntry = NULL;
+
+for ( i = 0; i  nCount; i++ )
+{
+pEntry = pColorList-GetColor(i);
+if( pEntry-GetColor() == mLastColor )
+aColorSet.SelectItem( i+1 );
+}
 }
 
 aColorSet.SetSelectHdl( LINK( this, SvxColorWindow_Impl, SelectHdl ) );
@@ -1206,6 +1217,7 @@ IMPL_LINK_NOARG(SvxColorWindow_Impl, SelectHdl)
 SfxToolBoxControl::Dispatch( Reference XDispatchProvider ( 
GetFrame()-getController(), UNO_QUERY ),
  maCommand,
  aArgs );
+aColorSet.SelectItem( nItemId );
 }
 
 return 0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - svx/source

[Tomofumi Yagi]

 svx/source/tbxctrls/tbcontrl.cxx |   12 
 1 file changed, 12 insertions(+)

New commits:
commit eb492e0bcf5c05d3ee5b95f4cc7e598845b26db2
Author: Tomofumi Yagi ya...@mknada.sakura.ne.jp
Date:   Sat Apr 19 16:52:44 2014 +0900

fdo#73891 Fix UI color panel does not show the actual color in Writer

1.The Font/Background/Highlight Color panels identify the actual color
 by a small frame.
 (Regression from the commit 35aa48d80b4b800d408d26bd72fbdfd711abbb6f
  See also fdo#32376 - Set default color to the current one in toolbar
  popups)

2.Fix this in the Floating Font/Background/Highlight Color Toolbar,too.

Change-Id: I5c2db8ab8923ab146cbf921dcb90894765f8420c
Reviewed-on: https://gerrit.libreoffice.org/9103
Reviewed-by: Kohei Yoshida libreoff...@kohei.us
Tested-by: Kohei Yoshida libreoff...@kohei.us
(cherry picked from commit 5c31515d2e54a42ceac1b21409cb730cdbb825ed)

Signed-off-by: Kohei Yoshida kohei.yosh...@collabora.com

diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 62f2ee2..1d96781 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -1128,6 +1128,17 @@ SvxColorWindow_Impl::SvxColorWindow_Impl( const 
OUStringrCommand,
 SetOutputSizePixel(Size(aNewSize.Width() + nAdd, aNewSize.Height() + 
nAdd));
 aColorSet.Clear();
 aColorSet.addEntriesForXColorList(*pColorList);
+
+short i = 0;
+long nCount = pColorList-Count();
+XColorEntry* pEntry = NULL;
+
+for ( i = 0; i  nCount; i++ )
+{
+pEntry = pColorList-GetColor(i);
+if( pEntry-GetColor() == mLastColor )
+aColorSet.SelectItem( i+1 );
+}
 }
 
 aColorSet.SetSelectHdl( LINK( this, SvxColorWindow_Impl, SelectHdl ) );
@@ -1200,6 +1211,7 @@ IMPL_LINK_NOARG(SvxColorWindow_Impl, SelectHdl)
 SfxToolBoxControl::Dispatch( Reference XDispatchProvider ( 
GetFrame()-getController(), UNO_QUERY ),
  maCommand,
  aArgs );
+aColorSet.SelectItem( nItemId );
 }
 
 return 0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tomofumi Yagi]

 include/svx/tbcontrl.hxx |1 -
 svx/source/tbxctrls/tbcontrl.cxx |9 ++---
 2 files changed, 2 insertions(+), 8 deletions(-)

New commits:
commit f5dc536eae7dc28e09112ab9dd69e55fae015ee8
Author: Tomofumi Yagi ya...@mknada.sakura.ne.jp
Date:   Sun Apr 20 16:27:10 2014 +0900

fdo#77683 the color in the toolbar buttons doesn't change.

The color in the toolbar buttons doesn't change when we use the Floating
Font/Background/Highlight Color Toolbar.
This problem seems happen sometimes,not always.

This patch modifies that SvxColorExtToolBoxControl::StateChanged()
in /svx/source/tbxctrls/tbcontrol.cxx handles SFX_ITEM_DEFAULT message
always.

Change-Id: If7410297db768c161287b75396186fbec3605f63
Reviewed-on: https://gerrit.libreoffice.org/9107
Reviewed-by: Kohei Yoshida libreoff...@kohei.us
Tested-by: Kohei Yoshida libreoff...@kohei.us

diff --git a/include/svx/tbcontrl.hxx b/include/svx/tbcontrl.hxx
index 94868ea..22c1c5e 100644
--- a/include/svx/tbcontrl.hxx
+++ b/include/svx/tbcontrl.hxx
@@ -269,7 +269,6 @@ class SVX_DLLPUBLIC SvxColorExtToolBoxControl : public 
SfxToolBoxControl
 
 ::svx::ToolboxButtonColorUpdater*   pBtnUpdater;
 Color   mLastColor;
-boolbChoiceFromPalette;
 
 public:
 SFX_DECL_TOOLBOX_CONTROL();
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 2c22294..2d1e733 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -2482,7 +2482,6 @@ SvxColorExtToolBoxControl::SvxColorExtToolBoxControl(
 mLastColor( COL_AUTO )
 {
 rTbx.SetItemBits( nId, TIB_DROPDOWN | rTbx.GetItemBits( nId ) );
-bChoiceFromPalette = false;
 
 // The following commands are available at the various modules
 switch( nSlotId )
@@ -2559,7 +2558,6 @@ SfxPopupWindow* 
SvxColorExtToolBoxControl::CreatePopupWindow()
 
FLOATWIN_POPUPMODE_GRABFOCUS|FLOATWIN_POPUPMODE_ALLOWTEAROFF|FLOATWIN_POPUPMODE_NOAPPFOCUSCLOSE
 );
 pColorWin-StartSelection();
 SetPopupWindow( pColorWin );
-bChoiceFromPalette = true;
 return pColorWin;
 }
 
@@ -2577,13 +2575,10 @@ void SvxColorExtToolBoxControl::StateChanged(
 rTbx.EnableItem( nId, SFX_ITEM_DISABLED != eState );
 rTbx.SetItemState( nId, ( SFX_ITEM_DONTCARE == eState ) ? 
TRISTATE_INDET : TRISTATE_FALSE );
 
-if (bChoiceFromPalette)
+if ( SFX_ITEM_DEFAULT == eState )
 {
-bChoiceFromPalette = false;
-
 const SvxColorItem* pItem = 0;
-if ( SFX_ITEM_DONTCARE != eState )
-pItem = PTR_CAST( SvxColorItem, pState );
+pItem = PTR_CAST( SvxColorItem, pState );
 
 if ( pItem )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/coinmp RepositoryExternal.mk

[Tomofumi Yagi]

 RepositoryExternal.mk |2 +-
 external/coinmp/ExternalPackage_coinmp.mk |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit cddbec75d402e260d6997ad69377346a8aa5774a
Author: Tomofumi Yagi ya...@mknada.sakura.ne.jp
Date:   Sat Apr 5 12:02:38 2014 +0900

Fix Windows build(external/coinmp)

This patch fixes the problem that a linker misses CoinMP.dll.
The problem will occurs when we use --enable-dbgutil option.

Change-Id: If6cec0f9705db2af33cb9a69d9440e3053c5979a
Reviewed-on: https://gerrit.libreoffice.org/8854
Reviewed-by: Matúš Kukan matus.ku...@collabora.com
Tested-by: Matúš Kukan matus.ku...@collabora.com

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index f6a4e2b..2892a71 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2032,7 +2032,7 @@ define gb_LinkTarget__use_coinmp
 $(call gb_LinkTarget_use_package,$(1),coinmp)
 ifeq ($(COM),MSC)
 $(call gb_LinkTarget_add_libs,$(1),\
-   $(call 
gb_UnpackedTarball_get_dir,coinmp)/CoinMP/MSVisualStudio/v9/release/CoinMP.lib \
+   $(call gb_UnpackedTarball_get_dir,coinmp)/CoinMP/MSVisualStudio/v9/$(if 
$(MSVC_USE_DEBUG_RUNTIME),Debug,Release)/CoinMP.lib \
 )
 else
 $(call gb_LinkTarget_add_libs,$(1),\
diff --git a/external/coinmp/ExternalPackage_coinmp.mk 
b/external/coinmp/ExternalPackage_coinmp.mk
index de01822..bbea3dd 100644
--- a/external/coinmp/ExternalPackage_coinmp.mk
+++ b/external/coinmp/ExternalPackage_coinmp.mk
@@ -12,7 +12,7 @@ $(eval $(call 
gb_ExternalPackage_ExternalPackage,coinmp,coinmp))
 $(eval $(call gb_ExternalPackage_use_external_project,coinmp,coinmp))
 
 ifeq ($(OS),WNT)
-$(eval $(call 
gb_ExternalPackage_add_file,coinmp,$(LIBO_LIB_FOLDER)/CoinMP.dll,CoinMP/MSVisualStudio/v9/release/CoinMP.dll))
+$(eval $(call 
gb_ExternalPackage_add_file,coinmp,$(LIBO_LIB_FOLDER)/CoinMP.dll,CoinMP/MSVisualStudio/v9/$(if
 $(MSVC_USE_DEBUG_RUNTIME),Debug,Release)/CoinMP.dll))
 else ifeq ($(OS),MACOSX)
 $(eval $(call 
gb_ExternalPackage_add_file,coinmp,$(LIBO_LIB_FOLDER)/libCbc.3.dylib,Cbc/src/.libs/libCbc.3.dylib))
 $(eval $(call 
gb_ExternalPackage_add_file,coinmp,$(LIBO_LIB_FOLDER)/libCbcSolver.3.dylib,Cbc/src/.libs/libCbcSolver.3.dylib))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tomofumi Yagi]

 vcl/quartz/ctfonts.cxx |   11 ++-
 1 file changed, 10 insertions(+), 1 deletion(-)

New commits:
commit cda903f83831341f44833b94e7d38e598f5a7198
Author: Tomofumi Yagi ya...@mknada.sakura.ne.jp
Date:   Sat Feb 15 11:48:20 2014 +0900

fdo#72042: Fix for Font names are not localized (Mac OS X)

This patch will bring the behavior of 4.0 to master(4.3).
This patch has 1 changes on implementation of vcl/quartz/ctfonts.cxx.

We will use CTFontDescriptorCopyLocalizedAttribute() API,If possible.
So DevFontFromCTFontDescriptor() can return the localized fontname.

Change-Id: I7eb5bda4fa69540fb32de573190a30bcb2c01cd2
Reviewed-on: https://gerrit.libreoffice.org/8071
Reviewed-by: Norbert Thiebaud nthieb...@gmail.com
Tested-by: Norbert Thiebaud nthieb...@gmail.com

diff --git a/vcl/quartz/ctfonts.cxx b/vcl/quartz/ctfonts.cxx
index fffd680..9c37c65 100644
--- a/vcl/quartz/ctfonts.cxx
+++ b/vcl/quartz/ctfonts.cxx
@@ -305,8 +305,17 @@ ImplDevFontAttributes DevFontFromCTFontDescriptor( 
CTFontDescriptorRef pFD, bool
 rDFA.mbSubsettable = true;
 
 // get font name
-CFStringRef pFamilyName = (CFStringRef)CTFontDescriptorCopyAttribute( pFD, 
kCTFontFamilyNameAttribute );
+const OUString aUILang = 
Application::GetSettings().GetUILanguageTag().getLanguage();
+CFStringRef pUILang = CFStringCreateWithCharacters( kCFAllocatorDefault, 
aUILang.getStr(), aUILang.getLength() );
+CFStringRef pLang = NULL;
+CFStringRef pFamilyName = 
(CFStringRef)CTFontDescriptorCopyLocalizedAttribute( pFD, 
kCTFontFamilyNameAttribute, pLang );
+if ( CFStringCompare( pUILang, pLang, 0 ) != kCFCompareEqualTo )
+{
+CFRelease( pFamilyName );
+pFamilyName = (CFStringRef)CTFontDescriptorCopyAttribute( pFD, 
kCTFontFamilyNameAttribute );
+}
 rDFA.SetFamilyName( GetOUString( pFamilyName ) );
+
 // get font style
 CFStringRef pStyleName = (CFStringRef)CTFontDescriptorCopyAttribute( pFD, 
kCTFontStyleNameAttribute );
 rDFA.SetStyleName( GetOUString( pStyleName ) );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: configure.ac

[Tomofumi Yagi]

 configure.ac |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 91bbb55f2877aada6f4bee966185287eeb3aaadd
Author: Tomofumi Yagi ya...@mknada.sakura.ne.jp
Date:   Sat Jan 4 17:01:55 2014 +0900

$MSM_PATH($msmdir) needs a path separator at the end of the line.

A error occurs in Visual Studio Express and Windows 7/8/8.1 environment,
 if a path separator at the end of the line is missing.
The registry entry for Merge Module directory has a path separator as 
suffix.

Change-Id: Ic1c51716631980e89f5bfa11a1d76b45c35e920e
Reviewed-on: https://gerrit.libreoffice.org/7272
Reviewed-by: Andras Timar andras.ti...@collabora.com
Tested-by: Andras Timar andras.ti...@collabora.com

diff --git a/configure.ac b/configure.ac
index 9a764f5..2047a6b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5199,8 +5199,8 @@ find_msms()
 fi
 done
 if test -z $msmdir; then
-AC_MSG_NOTICE([no registry entry for Merge Module directory - trying 
$COMMONPROGRAMFILES\Merge Modules])
-msmdir=$COMMONPROGRAMFILES\Merge Modules
+AC_MSG_NOTICE([no registry entry for Merge Module directory - trying 
${COMMONPROGRAMFILES}/Merge Modules/])
+msmdir=${COMMONPROGRAMFILES}/Merge Modules/
 fi
 msmdir=`cygpath -m $msmdir`
 if test -z $msmdir; then
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - i18npool/qa

[Tomofumi Yagi]

 i18npool/qa/cppunit/test_breakiterator.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 891c3f308ada19030ac4cdbed192ae5b0ea846aa
Author: Tomofumi Yagi ya...@mknada.sakura.ne.jp
Date:   Fri Nov 29 02:59:08 2013 +0900

Remove UTF-8 comment.

This breaks windows build with localized versions of MSVC.

Change-Id: I23c46830f96ae661eced88352476e7ae61fbcc2a
Reviewed-on: https://gerrit.libreoffice.org/6847
Reviewed-by: Eike Rathke er...@redhat.com
Tested-by: Eike Rathke er...@redhat.com

diff --git a/i18npool/qa/cppunit/test_breakiterator.cxx 
b/i18npool/qa/cppunit/test_breakiterator.cxx
index 631..15ce8a1 100644
--- a/i18npool/qa/cppunit/test_breakiterator.cxx
+++ b/i18npool/qa/cppunit/test_breakiterator.cxx
@@ -794,7 +794,7 @@ void TestBreakIterator::testLao()
 lang::Locale aLocale;
 aLocale.Language = lo;
 aLocale.Country = LA;
-//ຍິນດີຕ້ອນຮັບ
+
 const sal_Unicode LAO[] = { 0x0e8d, 0x0eb4, 0x0e99, 0x0e94, 0x0eb5, 
0x0e95, 0x0ec9, 0x0ead, 0x0e99, 0x0eae, 0x0eb1, 0x0e9a };
 OUString aTest(LAO, SAL_N_ELEMENTS(LAO));
 i18n::Boundary aBounds = m_xBreak-getWordBoundary(aTest, 0, aLocale,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tomofumi Yagi]

 i18npool/qa/cppunit/test_breakiterator.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7d3999f2f2170ce836a00f1cbac6a49a4c719e5d
Author: Tomofumi Yagi ya...@mknada.sakura.ne.jp
Date:   Fri Nov 29 02:59:08 2013 +0900

Remove UTF-8 comment.

This breaks windows build with localized versions of MSVC.

Change-Id: I23c46830f96ae661eced88352476e7ae61fbcc2a
Reviewed-on: https://gerrit.libreoffice.org/6847
Reviewed-by: Eike Rathke er...@redhat.com
Tested-by: Eike Rathke er...@redhat.com

diff --git a/i18npool/qa/cppunit/test_breakiterator.cxx 
b/i18npool/qa/cppunit/test_breakiterator.cxx
index 631..15ce8a1 100644
--- a/i18npool/qa/cppunit/test_breakiterator.cxx
+++ b/i18npool/qa/cppunit/test_breakiterator.cxx
@@ -794,7 +794,7 @@ void TestBreakIterator::testLao()
 lang::Locale aLocale;
 aLocale.Language = lo;
 aLocale.Country = LA;
-//ຍິນດີຕ້ອນຮັບ
+
 const sal_Unicode LAO[] = { 0x0e8d, 0x0eb4, 0x0e99, 0x0e94, 0x0eb5, 
0x0e95, 0x0ec9, 0x0ead, 0x0e99, 0x0eae, 0x0eb1, 0x0e9a };
 OUString aTest(LAO, SAL_N_ELEMENTS(LAO));
 i18n::Boundary aBounds = m_xBreak-getWordBoundary(aTest, 0, aLocale,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Bugous bug fix

[Tomofumi Yagi]

Hi Zolnai,

I'm sorry for the late reply.

There is a small part of the patch, which make to draw hairline 
primitive,
when the line is solid (before only the width was checked). Maybe this 
part
fixed the original bug, because as I see the hairline primitive means 
a solid line.


Please refer to the fdo#37129.
https://bugs.freedesktop.org/show_bug.cgi?id=37129


I made some screen shot, which shows dashed border changing with zoom 
level.
It's important that the same code is used by Writer so it has the same 
issue.

(snip)
2. Call ApplyLineDashing without scale (but the used unit is MAP_PIXEL)
Calc will work similar.
Writer will loose the zooming issue but the snippets will be too 
small,

because of the pixel pattern of ApplyLineDashing.

That's right.
When we call ApplyLineDashing without scale, the snipet size is 
completely different in Calc and Writer.

ApplyLineDashing with scale is intended to prevent this.
In LibreOffice 3.3, the size of the snipet was roughly the same in the 
appearance on the screen in both programs.


Best regards,
Tomofumi Yagi.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: l10ntools/inc l10ntools/source solenv/gbuild

[Tomofumi Yagi]

 l10ntools/inc/common.hxx  |2 ++
 l10ntools/inc/export.hxx  |4 +++-
 l10ntools/source/common.cxx   |9 +++--
 l10ntools/source/export.cxx   |8 +---
 solenv/gbuild/AllLangResTarget.mk |3 ++-
 5 files changed, 19 insertions(+), 7 deletions(-)

New commits:
commit fff70bf98c7a5a63aa0db11e93a3512c6a9a9359
Author: Tomofumi Yagi ya...@mknada.sakura.ne.jp
Date:   Sat Sep 7 10:04:30 2013 +0900

fdo#68790: fix build error on Win when system locale==Japanese(Japan)

This patch modifies transex3.
Modified transex3 outputs a file with BOM(if MergeMode is true).
*.[hs]rc files with BOM avoid this problem.
This problem is that MSVC interprets UTF-8 source code without BOM as
 local codepage when system locale is Japanese(Japan).

Change-Id: I3e12499a91a954236f48e6d7e360d26c93d19ed6
Reviewed-on: https://gerrit.libreoffice.org/5851
Tested-by: Markus Mohrhard markus.mohrh...@googlemail.com
Tested-by: Kohei Yoshida libreoff...@kohei.us
Reviewed-by: Kohei Yoshida libreoff...@kohei.us

diff --git a/l10ntools/inc/common.hxx b/l10ntools/inc/common.hxx
index 5a12bbb..047d2f4 100644
--- a/l10ntools/inc/common.hxx
+++ b/l10ntools/inc/common.hxx
@@ -28,12 +28,14 @@ struct HandledArgs
 OString m_sMergeSrc;
 OString m_sLanguage;
 bool m_bMergeMode;
+bool m_bUTF8BOM;
 HandledArgs()
 : m_sInputFile( OString() )
 , m_sOutputFile( OString() )
 , m_sMergeSrc( OString() )
 , m_sLanguage( OString() )
 , m_bMergeMode( false )
+, m_bUTF8BOM( false )
 {}
 };
 
diff --git a/l10ntools/inc/export.hxx b/l10ntools/inc/export.hxx
index 595c027..b9d2603 100644
--- a/l10ntools/inc/export.hxx
+++ b/l10ntools/inc/export.hxx
@@ -226,9 +226,11 @@ private:
 
 void CutComment( OString rText );
 
+void WriteUTF8ByteOrderMarkToOutput() { *aOutput.mSimple  '\xEF'  
'\xBB'  '\xBF'; }
+
 public:
 Export( const OString rOutput );
-Export(const OString rMergeSource, const OString rOutput, const OString 
rLanguage);
+Export(const OString rMergeSource, const OString rOutput, const OString 
rLanguage, bool bUTF8BOM);
 ~Export();
 
 void Init();
diff --git a/l10ntools/source/common.cxx b/l10ntools/source/common.cxx
index db86845..78274b8 100644
--- a/l10ntools/source/common.cxx
+++ b/l10ntools/source/common.cxx
@@ -43,6 +43,10 @@ bool handleArguments(
 {
 nState = STATE_LANGUAGES;
 }
+else if ( OString( argv[ i ] ).toAsciiUpperCase() == -B )
+{
+o_aHandledArgs.m_bUTF8BOM = true;
+}
 else
 {
 switch ( nState )
@@ -90,12 +94,13 @@ void writeUsage(const OString rName, const OString 
rFileType)
 {
 std::cout
   Syntax:   rName.getStr()
-  -i FileIn -o FileOut [-m DataBase] [-l Lang]\n
+  -i FileIn -o FileOut [-m DataBase] [-l Lang] [-b]\n
   FileIn:   Source files (  rFileType.getStr()  )\n
   FileOut:  Destination file (*.*)\n
   DataBase: Mergedata (*.po)\n
   Lang: Restrict the handled language; one element of\n
-  (de, en-US, ...) or all\n;
+  (de, en-US, ...) or all\n
+  -b:   Add UTF-8 Byte Order Mark to FileOut(use with -m option)\n;
 }
 
 void writePoEntry(
diff --git a/l10ntools/source/export.cxx b/l10ntools/source/export.cxx
index b439389..864e7b2 100644
--- a/l10ntools/source/export.cxx
+++ b/l10ntools/source/export.cxx
@@ -69,8 +69,8 @@ FILE * init(int argc, char ** argv) {
 }
 
 if (aArgs.m_bMergeMode) {
-global::exporter.reset(
-new Export(aArgs.m_sMergeSrc, aArgs.m_sOutputFile, 
aArgs.m_sLanguage));
+global::exporter.reset(new Export(aArgs.m_sMergeSrc, 
aArgs.m_sOutputFile,
+  aArgs.m_sLanguage, 
aArgs.m_bUTF8BOM));
 } else {
 global::exporter.reset(new Export(aArgs.m_sOutputFile));
 }
@@ -198,7 +198,7 @@ Export::Export(const OString rOutput)
 
 Export::Export(
 const OString rMergeSource, const OString rOutput,
-const OString rLanguage )
+const OString rLanguage, bool bUTF8BOM)
 :
 bDefine( sal_False ),
 bNextMustBeDefineEOL( sal_False ),
@@ -218,6 +218,8 @@ Export::Export(
 {
 aOutput.mSimple = new std::ofstream();
 aOutput.mSimple-open(rOutput.getStr(), std::ios_base::out | 
std::ios_base::trunc);
+
+if ( bUTF8BOM ) WriteUTF8ByteOrderMarkToOutput();
 }
 
 void Export::Init()
diff --git a/solenv/gbuild/AllLangResTarget.mk 
b/solenv/gbuild/AllLangResTarget.mk
index 6721a98..ac7a9af 100644
--- a/solenv/gbuild/AllLangResTarget.mk
+++ b/solenv/gbuild/AllLangResTarget.mk
@@ -50,7 +50,8 @@ $(call gb_Helper_abbreviate_dirs,\
-i $(3) \
-o $(1) \
-m $${MERGEINPUT} \
-   -l all)  \
+   -l all \
+   $(if $(filter MSC,$(COM)),$(if $(strip

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

[Tomofumi Yagi]

 l10ntools/source/merge.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit e457724d5ef1aaac98b6ff84ce1b054adda72abe
Author: Tomofumi Yagi ya...@mknada.sakura.ne.jp
Date:   Thu Sep 12 11:04:21 2013 +0200

fdo#69208 take getenv() call out of the loop

Change-Id: Iade7917eb9ade7248392e04f4653bda3674464aa

diff --git a/l10ntools/source/merge.cxx b/l10ntools/source/merge.cxx
index 63b212c..6752c7f 100644
--- a/l10ntools/source/merge.cxx
+++ b/l10ntools/source/merge.cxx
@@ -280,6 +280,8 @@ MergeDataFile::MergeDataFile(
 const OString rFileName, const OString rFile,
 bool bCaseSensitive, bool bWithQtz )
 {
+OString sEnableReleaseBuild(getenv(ENABLE_RELEASE_BUILD));
+
 std::ifstream aInputStream( rFileName.getStr() );
 if ( !aInputStream.is_open() )
 {
@@ -371,7 +373,7 @@ MergeDataFile::MergeDataFile(
 bFirstLang, bCaseSensitive );
 
 if( bFirstLang  bWithQtz 
-( strcmp(getenv(ENABLE_RELEASE_BUILD),TRUE) ) )
+!sEnableReleaseBuild.equals(TRUE) )
 {
 aLanguageSet.insert(qtz);
 InsertEntry(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: configure.ac

[Tomofumi Yagi]

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

New commits:
commit 3bfe3bfca27dcc4cb00a85c2b30a5a50f5bad689
Author: Tomofumi Yagi ya...@mknada.sakura.ne.jp
Date:   Tue Jul 16 20:53:44 2013 +0900

Add another fallback-path for wilangid.vbs(work it again)

Searching mechanism for wilangid.vbs(commit 265cc57) doesn't work
after commit 7f4a622(stop copying MSVC debug runtime DLLs).
That commit deleted $vsarch environment.
In configure,using $WINDWOS_SDK_ARCH instead of $vsarch will make it work
again(that is still set).

Change-Id: Ia45d30b2a724a36543038b14dd8defc3647ae455
Reviewed-on: https://gerrit.libreoffice.org/4935
Reviewed-by: Jan Holesovsky ke...@suse.cz
Tested-by: Jan Holesovsky ke...@suse.cz

diff --git a/configure.ac b/configure.ac
index 365391d..566b38c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9137,7 +9137,7 @@ the  Windows SDK are installed.])
 if test -z $WINDOWS_SDK_WILANGID -a -n $WINDOWS_SDK_HOME; then
 
WINDOWS_SDK_WILANGID=$WINDOWS_SDK_HOME/Samples/sysmgmt/msi/scripts/WiLangId.vbs
 if ! test -e $WINDOWS_SDK_WILANGID ; then
-WINDOWS_SDK_WILANGID=$WINDOWS_SDK_HOME/bin/$vsarch/WiLangId.vbs
+
WINDOWS_SDK_WILANGID=$WINDOWS_SDK_HOME/bin/$WINDOWS_SDK_ARCH/WiLangId.vbs
 fi
 if ! test -e $WINDOWS_SDK_WILANGID ; then
 AC_MSG_WARN([WiLangId.vbs not found - building translated packages 
will fail])
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

License Statement

[Tomofumi Yagi]

All of my past  future contributions to LibreOffice may be　licensed　
under the MPLv2/LGPLv3+ dual license.

Regards,
Tomofumi Yagi

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

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

[Tomofumi Yagi]

 sc/source/core/tool/reffind.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d715b40442bbe007a59c6c305fa42896704dbe2c
Author: Tomofumi Yagi ya...@mknada.sakura.ne.jp
Date:   Tue Apr 30 14:17:54 2013 -0400

Fix erroneous reference conversion.

Type '=A1+2', move the cursor over the 'A1', then press Shift-F4. It's
supposed to convert A1 to $A$1, but it changes it to $A$11 instead. This
commit fixes that bug.

Change-Id: Ia41c0617c5a93ad4a153dc4c84cd7db9e2b928f1

diff --git a/sc/source/core/tool/reffind.cxx b/sc/source/core/tool/reffind.cxx
index 6a42430..8b5b863 100644
--- a/sc/source/core/tool/reffind.cxx
+++ b/sc/source/core/tool/reffind.cxx
@@ -291,7 +291,7 @@ void ScRefFinder::ToggleRel( sal_Int32 nStartPos, sal_Int32 
nEndPos )
 OUString aTotal = maFormula.copy(0, nStartPos);
 aTotal += aResult;
 if (nEndPos  maFormula.getLength()-1)
-aTotal += maFormula.copy(nEndPos);
+aTotal += maFormula.copy(nEndPos+1);
 
 maFormula = aTotal;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [Libreoffice] [PATCH] fix for fdo#40831 - Writer will crash when searching text with using regular expressions

[Tomofumi Yagi]

Hi Cedric,

Thanks a lot for your reviewing.
I am very happy to hear the opinions of the expert.


(11/11/15 18:30), Cedric Bosdonnat wrote:

  * The if should be like the following or we still have the crash when
the last line is removed.
 if( pSavePos  pSavePos-nNode  uNodeCount )


I was wrong.
Thanks for pointing out.
I attached a revised patch.


  * Then I have no idea why you added the checks on the nIdx, I have the
impression that this is not really needed.




The verificationwill avoid the strange behavior such as the 
following(not a crash).


Steps to reproduce:
1. Create a new document
2. Type AAA
3. Edit  Find  replace
4. Find : A+
5. Replace with nothing
6. Check « Regular expressions »
7. Click “Replace all''
8. Close dialog.
9. Type B
10. Type Backspace key.
11. B is not deleted.

I think thatthis strange behavior should be corrected in the 
SwCursor::RestoreSavePos() method,
and SwCursor::RestoreSavePos() method should note both 
pSavePos-nNode and pSavePos-nCntnt value.

So I added the verification.
But, perhaps, the verificationmay not be included in the same commit to 
fix fdo#40831.

I noticed in your point,and I'm still wondering.

Please tell me your opinion again,If you think that you need.

Best regards,
--
Tomofumi Yagi

diff --git a/sw/source/core/crsr/swcrsr.cxx b/sw/source/core/crsr/swcrsr.cxx
index c27d8f7..fd6c782 100644
--- a/sw/source/core/crsr/swcrsr.cxx
+++ b/sw/source/core/crsr/swcrsr.cxx
@@ -2091,10 +2091,22 @@ sal_Bool SwCursor::MoveSection( SwWhichSection 
fnWhichSect,
 
 void SwCursor::RestoreSavePos()
 {
-if( pSavePos )
+// fdo#40831 if you delete the row or column containing pSavePos,
+// Writer will crash. Work around this.
+sal_uLong uNodeCount = GetPoint()-nNode.GetNodes().Count();
+if( pSavePos  pSavePos-nNode  uNodeCount )
 {
 GetPoint()-nNode = pSavePos-nNode;
-GetPoint()-nContent.Assign( GetCntntNode(), pSavePos-nCntnt );
+
+xub_StrLen nIdx = 0;
+if ( GetCntntNode() ) 
+if ( pSavePos-nCntnt = GetCntntNode()-Len() ) 
+nIdx = pSavePos-nCntnt;
+else 
+nIdx = GetCntntNode()-Len(); 
+else 
+nIdx = GetPoint()-nContent.GetIndex(); // Probably, nIdx = 0
+GetPoint()-nContent.Assign( GetCntntNode(), nIdx );
 }
 }
 
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice] [PATCH] fix for fdo#40831 - Writer will crash when searching text with using regular expressions

[Tomofumi Yagi]

Hi All,

This patch will fix fdo#40831 Writer will crash when searching text with using 
regular expressions.
Please review my attached patch.

Bug URL: https://bugs.freedesktop.org/show_bug.cgi?id=40831

I reproduced this bug on LibO 3.4 and 3.5.
This bug occurs when a row or column containing cursor position was removed by 
substitution. 
This patch is to skip the process of returning the position of the cursor,
when the row or column containing cursor position is removed.


My patch is being submitted under LGPLv3+/MPL.

Regards,
Tomofumi Yagi.  


diff --git a/sw/source/core/crsr/swcrsr.cxx b/sw/source/core/crsr/swcrsr.cxx
index c27d8f7..fd6c782 100644
--- a/sw/source/core/crsr/swcrsr.cxx
+++ b/sw/source/core/crsr/swcrsr.cxx
@@ -2091,10 +2091,22 @@ sal_Bool SwCursor::MoveSection( SwWhichSection 
fnWhichSect,
 
 void SwCursor::RestoreSavePos()
 {
-if( pSavePos )
+// fdo#40831 if you delete the row or column containing pSavePos,
+// Writer will crash. Work around this.
+sal_uLong uNodeCount = GetPoint()-nNode.GetNodes().Count();
+if( pSavePos  pSavePos-nNode = uNodeCount )
 {
 GetPoint()-nNode = pSavePos-nNode;
-GetPoint()-nContent.Assign( GetCntntNode(), pSavePos-nCntnt );
+
+xub_StrLen nIdx = 0;
+if ( GetCntntNode() ) 
+if ( pSavePos-nCntnt = GetCntntNode()-Len() ) 
+nIdx = pSavePos-nCntnt;
+else 
+nIdx = GetCntntNode()-Len(); 
+else 
+nIdx = GetPoint()-nContent.GetIndex(); // Probably, nIdx = 0
+GetPoint()-nContent.Assign( GetCntntNode(), nIdx );
 }
 }
 
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice] [PUSHED] Re: [PATCH] fix for fdo#37129 - Dotted and Dashed table borders are not drawn correctly

[Tomofumi Yagi]

Hi,

So many thanks for reviewing and pushing the patch.


And,There is  one more  please.

PleaseConsiderbackport the patch to 3.4, if possible.

This broblem on LibleOffice 3.4 as stable version gives to user a very bad 
feedback.

I hope to fix Bug 37129 on LibleOffice 3.4.


Regards,
Tomofumi Yagi.

https://bugs.freedesktop.org/show_bug.cgi?id=37129



(11/10/20 21:29), Jan Holesovsky wrote:

On 2011-10-20 at 02:12 -0700, cbosdonnat wrote:


You're patch is nice, many thanks for it! I pushed it to master:
http://cgit.freedesktop.org/libreoffice/core/commit/?id=8c2902ecbf135fae070ea032fa10a59bb76ec1b0

Just marking the patch as pushed :-) [in the mail thread].  Thank you a
lot for that!

Regards,
Kendy

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



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

[Libreoffice] [PATCH] fix for fdo#37129 - Dotted and Dashed table borders are not drawn correctly

[Tomofumi Yagi]

Hi All,

This patch will solve the problem that a thin line is drawn instead dotted and 
dashed line.
In addition, to solve the problem when drawing thick dotted and dashed lines.

Bug URL: https://bugs.freedesktop.org/show_bug.cgi?id=37129

My patch is being submitted under LGPLv3+/MPL.

Regards,
Tomofumi Yagi.  


diff --git 
a/drawinglayer/inc/drawinglayer/primitive2d/borderlineprimitive2d.hxx 
b/drawinglayer/inc/drawinglayer/primitive2d/borderlineprimitive2d.hxx
index 1428a10..61f7a17 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/borderlineprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/borderlineprimitive2d.hxx
@@ -33,6 +33,7 @@
 #include basegfx/color/bcolor.hxx
 #include basegfx/matrix/b2dhommatrix.hxx
 #include basegfx/polygon/b2dpolypolygon.hxx
+#include svtools/ctrlbox.hxx
 
 //
 
@@ -110,6 +111,11 @@ namespace drawinglayer
 return basegfx::fTools::equal(1.0, mfRightWidth);
 }
 
+bool isSolidLine() const
+{
+return (mnStyle==STYLE_SOLID); 
+}
+
 bool isInsideUsed() const
 {
 return !basegfx::fTools::equalZero(mfLeftWidth);
diff --git a/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx 
b/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx
index 33df59c..f0347d4 100644
--- a/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx
@@ -29,6 +29,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include precompiled_drawinglayer.hxx
 
+#include drawinglayer/geometry/viewinformation2d.hxx
 #include drawinglayer/primitive2d/borderlineprimitive2d.hxx
 #include drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx
 #include basegfx/polygon/b2dpolygon.hxx
@@ -79,7 +82,7 @@ namespace drawinglayer
 return basegfx::B2DPolyPolygon( clipPolygon );
 }
 
-Primitive2DSequence BorderLinePrimitive2D::create2DDecomposition(const 
geometry::ViewInformation2D /*rViewInformation*/) const
+Primitive2DSequence BorderLinePrimitive2D::create2DDecomposition(const 
geometry::ViewInformation2D rViewInformation) const
 {
 Primitive2DSequence xRetval;
 
@@ -214,6 +217,7 @@ namespace drawinglayer
 
 // Get which is the line to show
 bool bIsHairline = leftIsHairline();
+bool bIsSolidline = isSolidLine();
 double nWidth = getCorrectedLeftWidth();
 basegfx::BColor aColor = getRGBColorLeft();
 if ( basegfx::fTools::equal( 0.0, mfLeftWidth ) )
@@ -223,7 +227,7 @@ namespace drawinglayer
 aColor = getRGBColorRight();
 }
 
-if(bIsHairline)
+if(bIsHairline  bIsSolidline)
 {
 // create hairline primitive
 aPolygon.append( getStart() );
@@ -237,12 +241,13 @@ namespace drawinglayer
 {
 // create filled polygon primitive
 const basegfx::B2DVector aLineWidthOffset(((nWidth + 
1) * 0.5) * aPerpendicular);
+basegfx::B2DVector aScale( 
rViewInformation.getInverseObjectToViewTransformation() * aVector );
 
 aPolygon.append( aTmpStart );
 aPolygon.append( aTmpEnd );
 
 basegfx::B2DPolyPolygon aDashed = 
svtools::ApplyLineDashing(
-   aPolygon, getStyle(), MAP_100TH_MM );
+   aPolygon, getStyle(), MAP_PIXEL, 
aScale.getLength() );
 for (sal_uInt32 i = 0; i  aDashed.count(); i++ )
 {
 basegfx::B2DPolygon aDash = aDashed.getB2DPolygon( 
i );
diff --git a/drawinglayer/source/processor2d/vclprocessor2d.cxx 
b/drawinglayer/source/processor2d/vclprocessor2d.cxx
index 19648d4..dff42c3 100644
--- a/drawinglayer/source/processor2d/vclprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclprocessor2d.cxx
@@ -766,6 +766,10 @@ namespace drawinglayer
 }
 else
 {
+// remeber that we enter a PolygonStrokePrimitive2D 
decomposition,
+// used for AA thick line drawing
+mnPolygonStrokePrimitive2D++;
+
 mpOutputDevice-DrawPolyPolygon(aLocalPolyPolygon);
 
 if(mnPolygonStrokePrimitive2D 
@@ -783,6 +787,9 @@ namespace drawinglayer
 
mpOutputDevice-DrawPolyLine(aLocalPolyPolygon.getB2DPolygon(a), 0.0);
 }
 }
+
+// leave PolygonStrokePrimitive2D
+mnPolygonStrokePrimitive2D--;
 }
 }
 
diff