from:"Tomoyuki Kubota \(via logerrit\)"

core.git: vcl/source

2024-03-24 Thread Tomoyuki Kubota (via logerrit)

 vcl/source/text/textlayout.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6802878057e91a7d32b143d4e177de9b30e09a25
Author: Tomoyuki Kubota 
AuthorDate: Sun Mar 24 09:42:23 2024 +0100
Commit: Caolán McNamara 
CommitDate: Sun Mar 24 20:52:32 2024 +0100

for compilaton with OSL_DEBUG_LEVEL > 1, adapt to the commit f9395a12, 
which replaced std::vector with KernArray

Change-Id: I12e918814a29fff114c5eae320498a8fc0229dea
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165233
Tested-by: Jenkins
Tested-by: Caolán McNamara 
Reviewed-by: Caolán McNamara 

diff --git a/vcl/source/text/textlayout.cxx b/vcl/source/text/textlayout.cxx
index 303ea5b28659..7f69c1726fe1 100644
--- a/vcl/source/text/textlayout.cxx
+++ b/vcl/source/text/textlayout.cxx
@@ -606,7 +606,7 @@ namespace vcl
 aTrace.append( " = ( " );
 for ( sal_Int32 i=0; i<_nLength; )
 {
-aTrace.append( _pDXAry->at(i) );
+aTrace.append( _pDXAry->get(i) );
 if ( ++i < _nLength )
 aTrace.append( ", " );
 }

core.git: sfx2/source

2024-03-24 Thread Tomoyuki Kubota (via logerrit)

 sfx2/source/sidebar/DeckTitleBar.cxx |2 +-
 sfx2/source/sidebar/Panel.cxx|2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit ee2afff68ed5b22b2bf635d536584e8cba4ae2a4
Author: Tomoyuki Kubota 
AuthorDate: Sun Mar 24 12:07:07 2024 +0100
Commit: Noel Grandin 
CommitDate: Sun Mar 24 17:05:25 2024 +0100

for OSL_DEBUG_LEVEL >= 2, adapt to b55bf0cbdfdc6820

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

diff --git a/sfx2/source/sidebar/DeckTitleBar.cxx 
b/sfx2/source/sidebar/DeckTitleBar.cxx
index f425e21a92bc..f62ec6491f40 100644
--- a/sfx2/source/sidebar/DeckTitleBar.cxx
+++ b/sfx2/source/sidebar/DeckTitleBar.cxx
@@ -27,7 +27,7 @@
 #include 
 
 #if OSL_DEBUG_LEVEL >= 2
-#include 
+#include 
 #endif
 
 namespace sfx2::sidebar {
diff --git a/sfx2/source/sidebar/Panel.cxx b/sfx2/source/sidebar/Panel.cxx
index 6bc1424e7d41..1a087e177b78 100644
--- a/sfx2/source/sidebar/Panel.cxx
+++ b/sfx2/source/sidebar/Panel.cxx
@@ -28,7 +28,7 @@
 
 
 #if OSL_DEBUG_LEVEL >= 2
-#include 
+#include 
 #include 
 #endif

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

2022-09-07 Thread Tomoyuki Kubota (via logerrit)

 setup_native/source/win32/customactions/shellextensions/checkpatches.cxx |
5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

New commits:
commit 86498bcd73050e44ea5ea53c384edb0baf033d16
Author: Tomoyuki Kubota 
AuthorDate: Sun Mar 20 05:07:48 2022 +0100
Commit: Caolán McNamara 
CommitDate: Wed Sep 7 22:18:04 2022 +0200

tdf#147021 Use std::size() instead of SAL_N_ELEMENTS() macro

Change-Id: Ibd3f56f6e669a3bb1c1926aa4affdcc46623c81e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131855
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git 
a/setup_native/source/win32/customactions/shellextensions/checkpatches.cxx 
b/setup_native/source/win32/customactions/shellextensions/checkpatches.cxx
index 9bad21377b0b..d573161fb11b 100644
--- a/setup_native/source/win32/customactions/shellextensions/checkpatches.cxx
+++ b/setup_native/source/win32/customactions/shellextensions/checkpatches.cxx
@@ -20,9 +20,6 @@
 #include "shlxtmsi.hxx"
 #include 
 #include 
-#ifdef DEBUG
-#include 
-#endif
 
 #ifdef DEBUG
 inline void OutputDebugStringFormatW( PCWSTR pFormat, ... )
@@ -31,7 +28,7 @@ inline void OutputDebugStringFormatW( PCWSTR pFormat, ... )
 va_list args;
 
 va_start( args, pFormat );
-StringCchVPrintfW( buffer, SAL_N_ELEMENTS(buffer), pFormat, args );
+StringCchVPrintfW( buffer, std::size(buffer), pFormat, args );
 OutputDebugStringW( buffer );
 va_end(args);
 }

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

2022-06-07 Thread Tomoyuki Kubota (via logerrit)

 editeng/source/editeng/impedit3.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d1581fe4cc1d7ea0c8b3f54fec3e16c8348b7027
Author: Tomoyuki Kubota 
AuthorDate: Sat May 7 04:53:57 2022 +0100
Commit: Noel Grandin 
CommitDate: Tue Jun 7 21:10:21 2022 +0200

rPosition to pPosition

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

diff --git a/editeng/source/editeng/impedit3.cxx 
b/editeng/source/editeng/impedit3.cxx
index 14525b494ea0..4f0444f7e982 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -3276,7 +3276,7 @@ void ImpEditEngine::Paint( OutputDevice& rOutDev, 
tools::Rectangle aClipRect, Po
 aTmpFont.SetFillColor( COL_LIGHTGRAY );
 aTmpFont.SetTransparent( sal_False );
 }
-else if ( GetI18NScriptType( EditPaM( 
rPortion.GetNode(), nIndex+1 ) ) == i18n::ScriptType::COMPLEX )
+else if ( GetI18NScriptType( EditPaM( 
pPortion->GetNode(), nIndex+1 ) ) == i18n::ScriptType::COMPLEX )
 {
 aTmpFont.SetFillColor( COL_LIGHTCYAN );
 aTmpFont.SetTransparent( sal_False );

[Libreoffice-commits] core.git: Branch 'feature/cib_contract138c' - bridges/source

2022-01-31 Thread Tomoyuki Kubota (via logerrit)

 bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9cb88b7f888907a72bb0cd274b85ea9f6557a4f1
Author: Tomoyuki Kubota 
AuthorDate: Tue Sep 24 23:35:06 2019 +0900
Commit: Thorsten Behrens 
CommitDate: Mon Jan 31 17:07:29 2022 +0100

latest update of Visual Studio complains about typeinfo.h

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

diff --git a/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx 
b/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx
index 090ec5c13e38..b4d231436440 100644
--- a/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx
+++ b/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx
@@ -240,7 +240,7 @@ void
 
 #include 
 #include 
-#include 
+#include 
 #include 
 
 #include

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

2021-12-27 Thread Tomoyuki Kubota (via logerrit)

 sc/source/ui/attrdlg/scdlgfact.hxx |   45 -
 1 file changed, 45 deletions(-)

New commits:
commit 71eac37392f09f1f6f38c1a2848b7fae63eb774a
Author: Tomoyuki Kubota 
AuthorDate: Sat Dec 25 09:56:49 2021 +0100
Commit: Caolán McNamara 
CommitDate: Mon Dec 27 20:54:48 2021 +0100

remove unused DECL_ABSTDLG_BASE and IMPL_ABSTDLG_BASE

Change-Id: I8ba8f940cb4931974d10c8d6cf1d4fd205c18e71
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127469
Tested-by: Caolán McNamara 
Reviewed-by: Caolán McNamara 

diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx 
b/sc/source/ui/attrdlg/scdlgfact.hxx
index fef206002dea..8c1fea37e998 100644
--- a/sc/source/ui/attrdlg/scdlgfact.hxx
+++ b/sc/source/ui/attrdlg/scdlgfact.hxx
@@ -52,51 +52,6 @@
 #include 
 #include 
 
-#define DECL_ABSTDLG_BASE(Class,DialogClass)\
-ScopedVclPtr pDlg; \
-public: \
-explicitClass( DialogClass* p)  \
- : pDlg(p)  \
- {} \
-virtual ~Class() override;   \
-virtual short   Execute() override ;\
-virtual boolStartExecuteAsync(VclAbstractDialog::AsyncContext ) 
override; \
-std::vector getAllPageUIXMLDescriptions() const override; \
-bool selectPageByUIXMLDescription(const OString& rUIXMLDescription) 
override; \
-virtual BitmapEx createScreenshot() const override; \
-virtual OString GetScreenshotId() const override; \
-
-#define IMPL_ABSTDLG_BASE(Class)\
-Class::~Class() \
-{   \
-}   \
-short Class::Execute()  \
-{   \
-return pDlg->Execute(); \
-}   \
-bool Class::StartExecuteAsync(VclAbstractDialog::AsyncContext )\
-{ \
-return pDlg->StartExecuteAsync( rCtx ); \
-} \
-std::vector Class::getAllPageUIXMLDescriptions() const \
-{   \
-return pDlg->getAllPageUIXMLDescriptions(); \
-}   \
-bool Class::selectPageByUIXMLDescription(const OString& rUIXMLDescription) \
-{   \
-   return pDlg->selectPageByUIXMLDescription(rUIXMLDescription);  \
-}   \
-BitmapEx Class::createScreenshot() const\
-{   \
-VclPtr 
xDialogSurface(VclPtr::Create(DeviceFormat::DEFAULT)); \
-pDlg->createScreenshot(*xDialogSurface);\
-return xDialogSurface->GetBitmapEx(Point(), 
xDialogSurface->GetOutputSizePixel()); \
-}   \
-OString Class::GetScreenshotId() const  \
-{   \
-return pDlg->GetScreenshotId(); \
-}
-
 class AbstractScImportAsciiDlg_Impl : public AbstractScImportAsciiDlg
 {
 std::shared_ptr m_xDlg;

[Libreoffice-commits] core.git: solenv/sanitizers sw/qa sw/uiconfig sw/UIConfig_swriter.mk

2021-11-26 Thread Tomoyuki Kubota (via logerrit)

 solenv/sanitizers/ui/modules/swriter.suppr   |1 
 sw/UIConfig_swriter.mk   |1 
 sw/qa/unit/data/sw-dialogs-test.txt  |1 
 sw/qa/unit/data/sw-dialogs-test_2.txt|1 
 sw/uiconfig/swriter/ui/floatingnavigation.ui |  331 ---
 5 files changed, 335 deletions(-)

New commits:
commit d9796e597329849a6d360f205c5d36f7838884d8
Author: Tomoyuki Kubota 
AuthorDate: Fri Nov 26 00:10:59 2021 +0200
Commit: Caolán McNamara 
CommitDate: Fri Nov 26 14:13:48 2021 +0100

floatingnavigation.ui is no longer used

since

https://gerrit.libreoffice.org/c/core/+/87005/9/sw/source/uibase/utlui/navipi.cxx#b393
and

https://gerrit.libreoffice.org/c/core/+/87005/9/sw/source/uibase/ribbar/workctrl.cxx#b310

Change-Id: Id95f73d782f8d785b26ee6739014314c4d1a6fae
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125831
Tested-by: Jenkins
Tested-by: Julien Nabet 
Tested-by: Caolán McNamara 
Reviewed-by: Julien Nabet 
Reviewed-by: Caolán McNamara 

diff --git a/solenv/sanitizers/ui/modules/swriter.suppr 
b/solenv/sanitizers/ui/modules/swriter.suppr
index fd275e81c697..0c10473abe14 100644
--- a/solenv/sanitizers/ui/modules/swriter.suppr
+++ b/solenv/sanitizers/ui/modules/swriter.suppr
@@ -41,7 +41,6 @@ 
sw/uiconfig/swriter/ui/exchangedatabases.ui://GtkLabel[@id='dbnameft'] orphan-la
 sw/uiconfig/swriter/ui/flddocumentpage.ui://GtkSpinButton[@id='offset'] 
duplicate-mnemonic
 sw/uiconfig/swriter/ui/fldrefpage.ui://GtkLabel[@id='label4'] orphan-label
 sw/uiconfig/swriter/ui/fldvarpage.ui://GtkLabel[@id='label5'] orphan-label
-sw/uiconfig/swriter/ui/floatingnavigation.ui://GtkLabel[@id='label'] 
orphan-label
 sw/uiconfig/swriter/ui/footnotepage.ui://GtkLabel[@id='label6'] orphan-label
 sw/uiconfig/swriter/ui/footnotepage.ui://GtkLabel[@id='label7'] orphan-label
 sw/uiconfig/swriter/ui/footnotepage.ui://GtkLabel[@id='label8'] orphan-label
diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk
index ce3058308d6e..78b2b0441b8b 100644
--- a/sw/UIConfig_swriter.mk
+++ b/sw/UIConfig_swriter.mk
@@ -149,7 +149,6 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/fldfuncpage \
sw/uiconfig/swriter/ui/fldrefpage \
sw/uiconfig/swriter/ui/fldvarpage \
-   sw/uiconfig/swriter/ui/floatingnavigation \
sw/uiconfig/swriter/ui/floatingsync \
sw/uiconfig/swriter/ui/formatsectiondialog \
sw/uiconfig/swriter/ui/formattablepage \
diff --git a/sw/qa/unit/data/sw-dialogs-test.txt 
b/sw/qa/unit/data/sw-dialogs-test.txt
index 9bddf8bf92c6..bdb46c66f813 100644
--- a/sw/qa/unit/data/sw-dialogs-test.txt
+++ b/sw/qa/unit/data/sw-dialogs-test.txt
@@ -206,5 +206,4 @@ modules/swriter/ui/bibliographyentry.ui
 modules/swriter/ui/inforeadonlydialog.ui
 modules/swriter/ui/inforeadonlydialog.ui
 modules/swriter/ui/inforeadonlydialog.ui
-modules/swriter/ui/floatingnavigation.ui
 modules/swriter/ui/queryrotateintostandarddialog.ui
diff --git a/sw/qa/unit/data/sw-dialogs-test_2.txt 
b/sw/qa/unit/data/sw-dialogs-test_2.txt
index 9384a0a20591..fabeae19b3b2 100644
--- a/sw/qa/unit/data/sw-dialogs-test_2.txt
+++ b/sw/qa/unit/data/sw-dialogs-test_2.txt
@@ -75,5 +75,4 @@ modules/swriter/ui/bibliographyentry.ui
 modules/swriter/ui/inforeadonlydialog.ui
 modules/swriter/ui/inforeadonlydialog.ui
 modules/swriter/ui/inforeadonlydialog.ui
-modules/swriter/ui/floatingnavigation.ui
 modules/swriter/ui/queryrotateintostandarddialog.ui
diff --git a/sw/uiconfig/swriter/ui/floatingnavigation.ui 
b/sw/uiconfig/swriter/ui/floatingnavigation.ui
deleted file mode 100644
index 448406109d92..
--- a/sw/uiconfig/swriter/ui/floatingnavigation.ui
+++ /dev/null
@@ -1,331 +0,0 @@
-
-
-
-  
-  
-True
-False
-True
-4
-none
-
-  
-  
-True
-False
-True
-True
-12
-
-  
-True
-False
-True
-True
-vertical
-
-  
-True
-True
-icons
-False
-
-  
-True
-tbl
-Table
-True
-sw/res/sr20002.png
-  
-  
-False
-True
-  
-
-
-  
-True
-frm
-Frame
-True
-sw/res/sr20003.png
-  
-  
-False
-True
-  
-
-
-  
-True
-grf
-Graphics
-True
-sw/res/sr20009.png
-

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

2021-10-27 Thread Tomoyuki Kubota (via logerrit)

 configure.ac |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 17aca0f070bebdd05855c057858ace66f331e988
Author: Tomoyuki Kubota 
AuthorDate: Wed Oct 13 10:11:36 2021 +0200
Commit: Mike Kaganski 
CommitDate: Wed Oct 27 12:14:03 2021 +0200

changed description for option --with-visual-studio to indicate VS2022 is 
now supported

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

diff --git a/configure.ac b/configure.ac
index eea9b8bf61bb..f5ec60327f03 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2511,9 +2511,9 @@ libo_FUZZ_ARG_WITH(doxygen,
 ,with_doxygen=yes)
 
 AC_ARG_WITH(visual-studio,
-AS_HELP_STRING([--with-visual-studio=<2019>],
+AS_HELP_STRING([--with-visual-studio=<2019/2022>],
 [Specify which Visual Studio version to use in case several are
- installed. Currently only 2019 (default) is supported.]),
+ installed. Currently 2019 (default) and 2022 are supported.]),
 ,)
 
 AC_ARG_WITH(windows-sdk,
@@ -3866,7 +3866,7 @@ vs_versions_to_check()
 map_vs_year_to_version "$1"
 vsversions=$vsversion
 else
-# We accept only 2019
+# Default version is 2019
 vsversions="16"
 fi
 }
@@ -3925,7 +3925,7 @@ find_ucrt()
 
 find_msvc()
 {
-# Find Visual C++ 2019
+# Find Visual C++
 # Args: $1 (optional) : The VS version year
 # Return values: $vctest, $vcyear, $vctoolset, $vcnumwithdot, 
$vcbuildnumber
 
@@ -4021,7 +4021,7 @@ if test "$_os" = "WINNT"; then
 if test -n "$with_visual_studio"; then
 AC_MSG_ERROR([no Visual Studio $with_visual_studio installation 
found])
 else
-AC_MSG_ERROR([no Visual Studio 2019 installation found])
+AC_MSG_ERROR([no Visual Studio installation found])
 fi
 fi
 AC_MSG_RESULT([])
@@ -14631,7 +14631,7 @@ place yourself in a working directory of you choice.
 
  git clone git://git.savannah.gnu.org/make.git
 
- [go to Start menu, open "Visual Studio 2019", click "x86 Native Tools Command 
Prompt" or "x64 Native Tools Command Prompt"]
+ [go to Start menu, open "Visual Studio 2019" or "Visual Studio 2022", and 
then click "x86 Native Tools Command Prompt" or "x64 Native Tools Command 
Prompt"]
  set PATH=%PATH%;C:\Cygwin\bin
  [or Cygwin64, if that is what you have]
  cd path-to-make-repo-you-cloned-above

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

2021-10-25 Thread Tomoyuki Kubota (via logerrit)

 sc/source/core/data/stlpool.cxx |   14 ++
 1 file changed, 6 insertions(+), 8 deletions(-)

New commits:
commit bbd21f4069fd17a0f6b734b62a45f1fefc9c1f7f
Author: Tomoyuki Kubota 
AuthorDate: Mon Oct 25 09:11:25 2021 +0200
Commit: Noel Grandin 
CommitDate: Mon Oct 25 11:02:55 2021 +0200

expanding macro SCSTR

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

diff --git a/sc/source/core/data/stlpool.cxx b/sc/source/core/data/stlpool.cxx
index 5c0a5b313c18..a1082b6f5054 100644
--- a/sc/source/core/data/stlpool.cxx
+++ b/sc/source/core/data/stlpool.cxx
@@ -181,15 +181,13 @@ void ScStyleSheetPool::CopyStyleFrom( ScStyleSheetPool* 
pSrcPool,
 
 //  Standard templates
 
-#define SCSTR(id)   ScResId(id)
-
 void ScStyleSheetPool::CopyStdStylesFrom( ScStyleSheetPool* pSrcPool )
 {
 //  Copy Default styles
 
-CopyStyleFrom( pSrcPool, SCSTR(STR_STYLENAME_STANDARD), 
SfxStyleFamily::Para );
-CopyStyleFrom( pSrcPool, SCSTR(STR_STYLENAME_STANDARD), 
SfxStyleFamily::Page );
-CopyStyleFrom( pSrcPool, SCSTR(STR_STYLENAME_REPORT),   
SfxStyleFamily::Page );
+CopyStyleFrom( pSrcPool, ScResId(STR_STYLENAME_STANDARD), 
SfxStyleFamily::Para );
+CopyStyleFrom( pSrcPool, ScResId(STR_STYLENAME_STANDARD), 
SfxStyleFamily::Page );
+CopyStyleFrom( pSrcPool, ScResId(STR_STYLENAME_REPORT),   
SfxStyleFamily::Page );
 }
 
 static void lcl_CheckFont( SfxItemSet& rSet, LanguageType eLang, 
DefaultFontType nFontType, sal_uInt16 nItemId )
@@ -295,7 +293,7 @@ void ScStyleSheetPool::CreateStandardStyles()
 // Footer:
 // [empty][Page \STR_PAGE\][empty]
 
-aStr = SCSTR( STR_PAGE ) + " ";
+aStr = ScResId( STR_PAGE ) + " ";
 aEdEngine.SetTextCurrentDefaults( aStr );
 nStrLen = aStr.getLength();
 aEdEngine.QuickInsertField( SvxFieldItem(SvxPageField(), 
EE_FEATURE_FIELD), ESelection(0,nStrLen,0,nStrLen) );
@@ -307,7 +305,7 @@ void ScStyleSheetPool::CreateStandardStyles()
 
 // 2. Report
 
-pSheet = static_cast( ( SCSTR( STR_STYLENAME_REPORT ),
+pSheet = static_cast( ( ScResId( STR_STYLENAME_REPORT 
),
 SfxStyleFamily::Page,
 SfxStyleSearchBits::ScStandard ) );
 pSet = >GetItemSet();
@@ -360,7 +358,7 @@ void ScStyleSheetPool::CreateStandardStyles()
 // Footer:
 // [empty][Page: \PAGE\ / \PAGE\][empty]
 
-aStr = SCSTR( STR_PAGE ) + " ";
+aStr = ScResId( STR_PAGE ) + " ";
 nStrLen = aStr.getLength();
 aStr += " / ";
 sal_Int32 nStrLen2 = aStr.getLength();

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

2021-10-15 Thread Tomoyuki Kubota (via logerrit)

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

New commits:
commit bdb8c1796646fc89ae7e11cd0e8f3be1cbdcb848
Author: Tomoyuki Kubota 
AuthorDate: Fri Oct 15 15:34:04 2021 +0200
Commit: Noel Grandin 
CommitDate: Sat Oct 16 07:03:18 2021 +0200

adapt to the change from tools::Long* to std::vector*
since d4dc6b5c

Change-Id: Ic2104185aec40e01b81d3559c161d894a473d3a7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123631
Tested-by: Noel Grandin 
Reviewed-by: Noel Grandin 

diff --git a/vcl/source/gdi/textlayout.cxx b/vcl/source/gdi/textlayout.cxx
index 94a24254f99a..738b6d460fcb 100644
--- a/vcl/source/gdi/textlayout.cxx
+++ b/vcl/source/gdi/textlayout.cxx
@@ -177,7 +177,7 @@ namespace vcl
 aTrace.append( " = ( " );
 for ( sal_Int32 i=0; i<_nLength; )
 {
-aTrace.append( _pDXAry[i] );
+aTrace.append( _pDXAry->at(i) );
 if ( ++i < _nLength )
 aTrace.append( ", " );
 }

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

2021-10-15 Thread Tomoyuki Kubota (via logerrit)

 editeng/source/editeng/impedit3.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f5cffe30843b4afa81123ab972347e3142c9b87b
Author: Tomoyuki Kubota 
AuthorDate: Fri Oct 15 17:54:46 2021 +0200
Commit: Noel Grandin 
CommitDate: Sat Oct 16 07:02:52 2021 +0200

adapt to the variable name change from pPortion to rPortion since  35f03f26

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

diff --git a/editeng/source/editeng/impedit3.cxx 
b/editeng/source/editeng/impedit3.cxx
index 884a752218e3..9281f4d7dcf2 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -3241,7 +3241,7 @@ void ImpEditEngine::Paint( OutputDevice& rOutDev, 
tools::Rectangle aClipRect, Po
 aTmpFont.SetFillColor( COL_LIGHTGRAY );
 aTmpFont.SetTransparent( sal_False );
 }
-else if ( GetI18NScriptType( EditPaM( 
pPortion->GetNode(), nIndex+1 ) ) == i18n::ScriptType::COMPLEX )
+else if ( GetI18NScriptType( EditPaM( 
rPortion.GetNode(), nIndex+1 ) ) == i18n::ScriptType::COMPLEX )
 {
 aTmpFont.SetFillColor( COL_LIGHTCYAN );
 aTmpFont.SetTransparent( sal_False );

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

2021-04-02 Thread Tomoyuki Kubota (via logerrit)

 sfx2/source/sidebar/PanelTitleBar.cxx |3 ---
 1 file changed, 3 deletions(-)

New commits:
commit 4ff64681820d1b9c5b38015ecb42cba2e56800c3
Author: Tomoyuki Kubota 
AuthorDate: Thu Apr 1 23:17:29 2021 +0200
Commit: Caolán McNamara 
CommitDate: Fri Apr 2 11:09:50 2021 +0200

TitleBar is no longer InterimItemWindow

Change-Id: Ib8d6a3dc3dfe51baf5a859ff30e3d5cceaee8cde
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113479
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/sfx2/source/sidebar/PanelTitleBar.cxx 
b/sfx2/source/sidebar/PanelTitleBar.cxx
index 47de8e405584..c99672a0f1c5 100644
--- a/sfx2/source/sidebar/PanelTitleBar.cxx
+++ b/sfx2/source/sidebar/PanelTitleBar.cxx
@@ -46,9 +46,6 @@ PanelTitleBar::PanelTitleBar(const OUString& rsTitle,
 
 UpdateExpandedState();
 
-#ifdef DEBUG
-SetText(OUString("PanelTitleBar"));
-#endif
 }
 
 void PanelTitleBar::SetTitle(const OUString& rsTitle)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2021-04-02 Thread Tomoyuki Kubota (via logerrit)

 sfx2/source/sidebar/SidebarController.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a44eb7f8013f1e3f2165ee8295059bc1e75297a5
Author: Tomoyuki Kubota 
AuthorDate: Thu Apr 1 23:09:04 2021 +0200
Commit: Caolán McNamara 
CommitDate: Fri Apr 2 11:09:24 2021 +0200

welding the sidebar deck too for DEBUG mode

Change-Id: I1b05c39be1d9d6acd24fb0845756db9733649e7c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113478
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/sfx2/source/sidebar/SidebarController.cxx 
b/sfx2/source/sidebar/SidebarController.cxx
index e278ded14849..dded59176dd3 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -878,7 +878,7 @@ void SidebarController::SwitchToDeck (
 
 #ifdef DEBUG
 // Show the context name in the deck title bar.
-VclPtr pDebugTitleBar = mpCurrentDeck->GetTitleBar();
+DeckTitleBar* pDebugTitleBar = mpCurrentDeck->GetTitleBar();
 if (pDebugTitleBar)
 pDebugTitleBar->SetTitle(rDeckDescriptor.msTitle + " (" + 
maCurrentContext.msContext + ")");
 #endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2021-04-02 Thread Tomoyuki Kubota (via logerrit)

 setup_native/source/win32/customactions/shellextensions/checkpatches.cxx |
3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 366cc40006f8bbc56b397399dd026f9fbb421552
Author: Tomoyuki Kubota 
AuthorDate: Thu Apr 1 22:58:06 2021 +0200
Commit: Mike Kaganski 
CommitDate: Fri Apr 2 09:12:08 2021 +0200

add back sal/macros.h for SAL_N_ELEMENTS

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

diff --git 
a/setup_native/source/win32/customactions/shellextensions/checkpatches.cxx 
b/setup_native/source/win32/customactions/shellextensions/checkpatches.cxx
index 0a879dc1b80e..9bad21377b0b 100644
--- a/setup_native/source/win32/customactions/shellextensions/checkpatches.cxx
+++ b/setup_native/source/win32/customactions/shellextensions/checkpatches.cxx
@@ -20,6 +20,9 @@
 #include "shlxtmsi.hxx"
 #include 
 #include 
+#ifdef DEBUG
+#include 
+#endif
 
 #ifdef DEBUG
 inline void OutputDebugStringFormatW( PCWSTR pFormat, ... )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2021-02-18 Thread Tomoyuki Kubota (via logerrit)

 sw/source/core/text/guess.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit ddde467cdc60a0373c952c04b5f138ad96ff66e4
Author: Tomoyuki Kubota 
AuthorDate: Wed Feb 17 19:37:47 2021 +0100
Commit: Miklos Vajna 
CommitDate: Thu Feb 18 09:14:15 2021 +0100

adapt to prefixing , even when OSL_DEBUG_LEVEL > 1

Change-Id: I5fe9755eaf0cce963fda2dbc2ec27b31d0d7dc52
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111045
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 

diff --git a/sw/source/core/text/guess.cxx b/sw/source/core/text/guess.cxx
index 8f7d39566973..8bf9819c4d66 100644
--- a/sw/source/core/text/guess.cxx
+++ b/sw/source/core/text/guess.cxx
@@ -205,10 +205,10 @@ bool SwTextGuess::Guess( const SwTextPortion& rPor, 
SwTextFormatInfo ,
 m_nCutPos = rInf.GetTextBreak( nLineWidth, nMaxLen, nMaxComp, 
rInf.GetCachedVclData().get() );
 
 #if OSL_DEBUG_LEVEL > 1
-if ( TextFrameIndex(COMPLETE_STRING) != nCutPos )
+if ( TextFrameIndex(COMPLETE_STRING) != m_nCutPos )
 {
 sal_uInt16 nMinSize;
-rInf.GetTextSize( , rInf.GetIdx(), nCutPos - rInf.GetIdx(),
+rInf.GetTextSize( , rInf.GetIdx(), m_nCutPos - rInf.GetIdx(),
  nMaxComp, nMinSize, nMaxSizeDiff );
 OSL_ENSURE( nMinSize <= nLineWidth, "What a Guess!!!" );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-11-03 Thread Tomoyuki Kubota (via logerrit)

 svx/source/sidebar/inspector/InspectorTextPanel.cxx |4 +-
 sw/qa/uitest/styleInspector/styleInspector.py   |   36 
 2 files changed, 24 insertions(+), 16 deletions(-)

New commits:
commit 73e0b664881d95510be9605b98a2671926f4697a
Author: Tomoyuki Kubota 
AuthorDate: Sun Nov 1 16:24:59 2020 +0200
Commit: Xisco Fauli 
CommitDate: Tue Nov 3 16:02:33 2020 +0100

tdf#137886 condition for asian and ctl property seems wrong

Change-Id: Ifc11f3bbcc499143904ac7c206674cc692cf5239
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105054
Reviewed-by: Xisco Fauli 
Reviewed-by: Mike Kaganski 
Tested-by: Jenkins

diff --git a/svx/source/sidebar/inspector/InspectorTextPanel.cxx 
b/svx/source/sidebar/inspector/InspectorTextPanel.cxx
index 9ebcf24f9e14..13714e22bfde 100644
--- a/svx/source/sidebar/inspector/InspectorTextPanel.cxx
+++ b/svx/source/sidebar/inspector/InspectorTextPanel.cxx
@@ -62,9 +62,9 @@ InspectorTextPanel::InspectorTextPanel(vcl::Window* pParent,
 static bool GetPropertyValues(const OUString& rPropName, const uno::Any& rAny, 
OUString& rString)
 {
 // Hide Asian and Complex properties
-if (SvtLanguageOptions().IsCJKFontEnabled() && rPropName.indexOf("Asian") 
!= -1)
+if (!SvtLanguageOptions().IsCJKFontEnabled() && rPropName.indexOf("Asian") 
!= -1)
 return false;
-if (SvtLanguageOptions().IsCTLFontEnabled() && 
rPropName.indexOf("Complex") != -1)
+if (!SvtLanguageOptions().IsCTLFontEnabled() && 
rPropName.indexOf("Complex") != -1)
 return false;
 
 if (bool bValue; rAny >>= bValue)
diff --git a/sw/qa/uitest/styleInspector/styleInspector.py 
b/sw/qa/uitest/styleInspector/styleInspector.py
index 5eb9f8438e3e..8469d274ee3c 100644
--- a/sw/qa/uitest/styleInspector/styleInspector.py
+++ b/sw/qa/uitest/styleInspector/styleInspector.py
@@ -28,7 +28,7 @@ class styleNavigator(UITestCase):
 # The cursor is on text without formatting and default style
 self.assertEqual(1, len(xListBox.getChild('0').getChildren()))
 self.assertEqual("Default Paragraph Style", 
get_state_as_dict(xListBox.getChild('0').getChild('0'))['Text'])
-self.assertEqual(118, 
len(xListBox.getChild('0').getChild('0').getChildren()))
+self.assertEqual(136, 
len(xListBox.getChild('0').getChild('0').getChildren()))
 self.assertEqual(0, len(xListBox.getChild('1').getChildren()))
 self.assertEqual(0, len(xListBox.getChild('2').getChildren()))
 self.assertEqual(0, len(xListBox.getChild('3').getChildren()))
@@ -38,7 +38,7 @@ class styleNavigator(UITestCase):
 # The cursor is on text with direct formatting
 self.assertEqual(1, len(xListBox.getChild('0').getChildren()))
 self.assertEqual("Default Paragraph Style", 
get_state_as_dict(xListBox.getChild('0').getChild('0'))['Text'])
-self.assertEqual(118, 
len(xListBox.getChild('0').getChild('0').getChildren()))
+self.assertEqual(136, 
len(xListBox.getChild('0').getChild('0').getChildren()))
 self.assertEqual(0, len(xListBox.getChild('1').getChildren()))
 self.assertEqual(0, len(xListBox.getChild('2').getChildren()))
 
@@ -56,7 +56,7 @@ class styleNavigator(UITestCase):
 # The cursor is on text with paragraph direct formatting
 self.assertEqual(1, len(xListBox.getChild('0').getChildren()))
 self.assertEqual("Default Paragraph Style", 
get_state_as_dict(xListBox.getChild('0').getChild('0'))['Text'])
-self.assertEqual(118, 
len(xListBox.getChild('0').getChild('0').getChildren()))
+self.assertEqual(136, 
len(xListBox.getChild('0').getChild('0').getChildren()))
 
 xParDirFormatting = xListBox.getChild('1')
 self.assertEqual(7, len(xParDirFormatting.getChildren()))
@@ -77,21 +77,29 @@ class styleNavigator(UITestCase):
 xParStyle = xListBox.getChild('0')
 self.assertEqual(3, len(xParStyle.getChildren()))
 self.assertEqual("Default Paragraph Style", 
get_state_as_dict(xParStyle.getChild('0'))['Text'])
-self.assertEqual(118, len(xParStyle.getChild('0').getChildren()))
+self.assertEqual(136, len(xParStyle.getChild('0').getChildren()))
 self.assertEqual("Heading", 
get_state_as_dict(xParStyle.getChild('1'))['Text'])
-self.assertEqual(14, len(xParStyle.getChild('1').getChildren()))
+self.assertEqual(28, len(xParStyle.getChild('1').getChildren()))
 
 xTitleStyle = xParStyle.getChild('2')
 self.assertEqual("Title", get_state_as_dict(xTitleStyle)['Text'])
-self.assertEqual(8, len(xTitleStyle.getChildren()))
+self.assertEqual(16, len(xTitleStyle.getChildren()))
 self.assertEqual("Char Difference Height\t0", 
get_state_as_dict(xTitleStyle.getChild('0'))['Text'])
-self.assertEqual("Char Height\t28", 
get_state_as_dict(xTitleStyle.getChild('1'))['Text'])
-self.assertEqual("Char Property Height\t100",

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

2020-09-23 Thread Tomoyuki Kubota (via logerrit)

 vcl/source/filter/graphicfilter.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c0e18f68b6a03e2b8b5c0cf4ee7e1009c35dc26c
Author: Tomoyuki Kubota 
AuthorDate: Sat Aug 1 21:59:40 2020 +0200
Commit: Tomaž Vajngerl 
CommitDate: Wed Sep 23 09:06:57 2020 +0200

tdf#135303

"Color", not "Colors", is correct

Change-Id: I042c23224c4ae684976f1c165b2742dc100d9c73
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99914
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 

diff --git a/vcl/source/filter/graphicfilter.cxx 
b/vcl/source/filter/graphicfilter.cxx
index aee9bf14cdb9..d2b23edb627d 100644
--- a/vcl/source/filter/graphicfilter.cxx
+++ b/vcl/source/filter/graphicfilter.cxx
@@ -1893,7 +1893,7 @@ ErrCode GraphicFilter::ExportGraphic( const Graphic& 
rGraphic, const OUString& r
 if( aFilterName.equalsIgnoreAsciiCase( EXP_BMP ) )
 {
 BitmapEx aBmp( aGraphic.GetBitmapEx() );
-BmpConversion nColorRes = 
static_cast(aConfigItem.ReadInt32( "Colors", 0 ));
+BmpConversion nColorRes = 
static_cast(aConfigItem.ReadInt32( "Color", 0 ));
 if ( nColorRes != BmpConversion::NNONE && ( nColorRes <= 
BmpConversion::N24Bit) )
 {
 if( !aBmp.Convert( nColorRes ) )
___
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' - cui/source

2020-06-16 Thread Tomoyuki Kubota (via logerrit)

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

New commits:
commit d8da7169e3c94ee813a532932b71fe433f899f87
Author: Tomoyuki Kubota 
AuthorDate: Thu Jun 11 01:36:28 2020 +0200
Commit: Xisco Fauli 
CommitDate: Tue Jun 16 13:10:15 2020 +0200

fix my own mistake

Change-Id: I01f3b405e91175ab0ef532505bf9f275073d2fc0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96044
Tested-by: Jenkins
Reviewed-by: Noel Grandin 
(cherry picked from commit 9457326e17505c9a17f40b2f932b21a4436eeae1)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96096
Reviewed-by: Xisco Fauli 

diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 6b2a83d38dc3..04664d511b2b 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -136,7 +136,7 @@ void printProperties(
 const OUString& prefix,
 const uno::Sequence< beans::PropertyValue >& aProp )
 {
-for (PropertyValue const & aPropVal : aProp)
+for (beans::PropertyValue const & aPropVal : aProp)
 {
 OUString tmp;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-06-11 Thread Tomoyuki Kubota (via logerrit)

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

New commits:
commit 9457326e17505c9a17f40b2f932b21a4436eeae1
Author: Tomoyuki Kubota 
AuthorDate: Thu Jun 11 01:36:28 2020 +0200
Commit: Noel Grandin 
CommitDate: Thu Jun 11 08:42:04 2020 +0200

fix my own mistake

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

diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index e7cea5f48d97..05fc63f442d6 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -136,7 +136,7 @@ void printProperties(
 const OUString& prefix,
 const uno::Sequence< beans::PropertyValue >& aProp )
 {
-for (PropertyValue const & aPropVal : aProp)
+for (beans::PropertyValue const & aPropVal : aProp)
 {
 OUString tmp;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-05-19 Thread Tomoyuki Kubota (via logerrit)

 include/xmloff/xmlimp.hxx |1 +
 xmloff/source/core/xmlimp.cxx |4 
 2 files changed, 5 insertions(+)

New commits:
commit 96db6fb300473fc7ba2af22770f0a7bd7c4f780b
Author: Tomoyuki Kubota 
AuthorDate: Sun May 17 04:31:01 2020 +0900
Commit: Michael Stahl 
CommitDate: Tue May 19 17:03:57 2020 +0200

xmloff: ODF import: Silence "unknown LO version: 7000"

Change-Id: I56cf3b03274cc24f66bbfc9d3615fa57521a6cd1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94368
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/include/xmloff/xmlimp.hxx b/include/xmloff/xmlimp.hxx
index 39990af79d7a..351a05887ebd 100644
--- a/include/xmloff/xmlimp.hxx
+++ b/include/xmloff/xmlimp.hxx
@@ -558,6 +558,7 @@ public:
 /// @ATTENTION: when adding a new value more specific than "6x", grep for
 /// all current uses and adapt them!!!
 static const sal_uInt16 LO_6x = 60 | LO_flag;
+static const sal_uInt16 LO_7x = 70 | LO_flag;
 static const sal_uInt16 ProductVersionUnknown = SAL_MAX_UINT16;
 
 /** depending on whether the generator version indicates LO, compare
diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx
index 78c967fa72fc..36550f1f8192 100644
--- a/xmloff/source/core/xmlimp.cxx
+++ b/xmloff/source/core/xmlimp.cxx
@@ -198,6 +198,10 @@ public:
 {
 mnGeneratorVersion = SvXMLImport::LO_6x;
 }
+else if ('7' == loVersion[0])
+{
+mnGeneratorVersion = SvXMLImport::LO_7x;
+}
 else
 {
 SAL_INFO("xmloff.core", "unknown LO version: " << 
loVersion);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-05-15 Thread Tomoyuki Kubota (via logerrit)

 filter/source/config/tools/merge/pyAltFCFGMerge |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 44006d2fdc67c1b2ff68407b16b4b4939012282c
Author: Tomoyuki Kubota 
AuthorDate: Fri May 15 12:20:13 2020 +0900
Commit: Noel Grandin 
CommitDate: Fri May 15 08:35:09 2020 +0200

make a raw docstring as it contains backslash

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

diff --git a/filter/source/config/tools/merge/pyAltFCFGMerge 
b/filter/source/config/tools/merge/pyAltFCFGMerge
index 70833492fd0d..7040108e83f1 100755
--- a/filter/source/config/tools/merge/pyAltFCFGMerge
+++ b/filter/source/config/tools/merge/pyAltFCFGMerge
@@ -44,7 +44,7 @@ PROP_SHARE_SUBDIR_NAME = "share_subdir_name"  # // <= 
cmdline
 PROP_ITEMS   = "items"# // <= pkg cfg files!
 
 #---begin java.util.Properties copy---#
-"""
+r"""
 
 An incomplete clean room implementation of 
 java.util.Properties written in Python.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-05-13 Thread Tomoyuki Kubota (via logerrit)

 dbaccess/source/ui/misc/linkeddocuments.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit ae7560781cc8c73e48716b27cbd5f7adaabdfb25
Author: Tomoyuki Kubota 
AuthorDate: Wed May 13 10:55:53 2020 +0900
Commit: Noel Grandin 
CommitDate: Wed May 13 08:29:43 2020 +0200

aInfo should be used

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

diff --git a/dbaccess/source/ui/misc/linkeddocuments.cxx 
b/dbaccess/source/ui/misc/linkeddocuments.cxx
index ce4b6554f6d0..13effe4ccd93 100644
--- a/dbaccess/source/ui/misc/linkeddocuments.cxx
+++ b/dbaccess/source/ui/misc/linkeddocuments.cxx
@@ -308,7 +308,6 @@ namespace dbaui
 aSQLException.Message = sMessage;
 aInfo = dbtools::SQLExceptionInfo(aSQLException);
 }
-return xRet;
 }
 catch(const css::io::WrongFormatException )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-04-12 Thread Tomoyuki Kubota (via logerrit)

 sfx2/source/appl/app.cxx |   31 +++
 1 file changed, 27 insertions(+), 4 deletions(-)

New commits:
commit 7768889c351e079f4fc59647ccafc37013217040
Author: Tomoyuki Kubota 
AuthorDate: Sun Apr 12 17:27:24 2020 +0900
Commit: Noel Grandin 
CommitDate: Sun Apr 12 12:32:49 2020 +0200

More fixes to loading of basctl with --enable-mergelibs

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

diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx
index c09b415825f6..5bb09cce532b 100644
--- a/sfx2/source/appl/app.cxx
+++ b/sfx2/source/appl/app.cxx
@@ -18,6 +18,7 @@
  */
 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -390,9 +391,20 @@ IMPL_STATIC_LINK( SfxApplication, 
GlobalBasicErrorHdl_Impl, StarBASIC*, pStarBas
 #else
 
 #ifndef DISABLE_DYNLOADING
-// load basctl module
 osl::Module aMod;
-aMod.loadRelative(, SVLIBRARY("basctl"));
+// load basctl module
+if (!aMod.loadRelative(
+,
+#if ENABLE_MERGELIBS
+SVLIBRARY("merged")
+#else
+SVLIBRARY("basctl")
+#endif
+))
+{
+SAL_WARN("sfx.appl", "cannot load basctl");
+return false;
+}
 
 // get symbol
 basicide_handle_basic_error pSymbol = 
reinterpret_cast(aMod.getFunctionSymbol("basicide_handle_basic_error"));
@@ -483,9 +495,20 @@ void SfxApplication::MacroOrganizer(weld::Window* pParent, 
sal_Int16 nTabId)
 #else
 
 #ifndef DISABLE_DYNLOADING
-// load basctl module
 osl::Module aMod;
-aMod.loadRelative(, SVLIBRARY("basctl"));
+// load basctl module
+if (!aMod.loadRelative(
+,
+#if ENABLE_MERGELIBS
+SVLIBRARY("merged")
+#else
+SVLIBRARY("basctl")
+#endif
+))
+{
+SAL_WARN("sfx.appl", "cannot load basctl");
+return;
+}
 
 // get symbol
 basicide_macro_organizer pSymbol = 
reinterpret_cast(aMod.getFunctionSymbol("basicide_macro_organizer"));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Repository.mk

2020-04-11 Thread Tomoyuki Kubota (via logerrit)

 Repository.mk |1 -
 1 file changed, 1 deletion(-)

New commits:
commit c4dbb0386a4985fd4a13ec81c3177418097642f7
Author: Tomoyuki Kubota 
AuthorDate: Sat Apr 11 12:02:23 2020 +0900
Commit: Thorsten Behrens 
CommitDate: Sat Apr 11 15:10:37 2020 +0200

Resolves build error from patch I9392c0b550328fc16e1f6c30b02a6d4afbdb2ff0

Change-Id: I2fa7c291c2635fb7ec15a8cc30f7a4a39a2f5b37
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92054
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 

diff --git a/Repository.mk b/Repository.mk
index c80fe356d6e1..83e8ffa6d885 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -881,7 +881,6 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo,\
extras_gallmytheme \
extras_gallroot \
extras_gallsystem \
-   extras_gallwwwgraf \
extras_glade \
extras_labels \
$(if $(filter WNT,$(OS)),extras_newfiles) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-01-20 Thread Tomoyuki Kubota (via logerrit)

 vcl/skia/SkiaHelper.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9245fd026a2cba4bd90c7885c00d328bc34f3484
Author: Tomoyuki Kubota 
AuthorDate: Sat Jan 18 21:19:14 2020 +0900
Commit: Luboš Luňák 
CommitDate: Mon Jan 20 16:05:03 2020 +0100

bEnable for UseSkia is reversed

Change-Id: I05f0601604ea1bc0d847ddee709c2d28c623b36b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87013
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 

diff --git a/vcl/skia/SkiaHelper.cxx b/vcl/skia/SkiaHelper.cxx
index 4ea63f85db8a..20bf299cfb56 100644
--- a/vcl/skia/SkiaHelper.cxx
+++ b/vcl/skia/SkiaHelper.cxx
@@ -85,7 +85,7 @@ bool isVCLSkiaEnabled()
 bEnable = bEnableSkiaEnv;
 
 if (officecfg::Office::Common::VCL::UseSkia::get())
-bEnable = false;
+bEnable = true;
 
 // Force disable in safe mode
 if (Application::IsSafeModeEnabled())
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - 2 commits - configure.ac sd/Library_sd.mk

2019-11-19 Thread Tomoyuki Kubota (via logerrit)

 configure.ac |4 
 sd/Library_sd.mk |5 -
 2 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 9d507d31b262b271d259b4314d3d5cab373ab5a6
Author: Tomoyuki Kubota 
AuthorDate: Wed Jun 12 02:39:56 2019 +0900
Commit: Andras Timar 
CommitDate: Tue Nov 19 23:59:10 2019 +0100

test command does not do short-circuit evaluation

Change-Id: Iaaeb479698c79f2cea3fd2e3914c17d3a2692981
Reviewed-on: https://gerrit.libreoffice.org/73837
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 

diff --git a/configure.ac b/configure.ac
index e10bf8849044..3c3291d8a5b2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10198,7 +10198,7 @@ if test -n "$enable_sdremote" -a "$enable_sdremote" != 
"no"; then
 ENABLE_SDREMOTE=TRUE
 AC_MSG_CHECKING([whether to enable Bluetooth support in Impress remote 
control])
 
-if test $OS = MACOSX -a "$MAC_OS_X_VERSION_MAX_ALLOWED" -ge 101500; then
+if test $OS = MACOSX && test "$MAC_OS_X_VERSION_MAX_ALLOWED" -ge 101500; 
then
 # The Bluetooth code doesn't compile with macOS SDK 10.15
 enable_sdremote_bluetooth=no
 fi
commit dce3478ab53b679f4a6a8d8a903cb6a2e938dbd1
Author: Tor Lillqvist 
AuthorDate: Wed Jun 5 02:06:00 2019 +0300
Commit: Andras Timar 
CommitDate: Tue Nov 19 23:59:10 2019 +0100

The Bluetooth code doesn't compile with macOS SDK 10.15

Change-Id: I8fffa4cef9628e6872c881cd0cbdfe85495fa324

diff --git a/configure.ac b/configure.ac
index bfcc32b65d2e..e10bf8849044 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10198,6 +10198,10 @@ if test -n "$enable_sdremote" -a "$enable_sdremote" != 
"no"; then
 ENABLE_SDREMOTE=TRUE
 AC_MSG_CHECKING([whether to enable Bluetooth support in Impress remote 
control])
 
+if test $OS = MACOSX -a "$MAC_OS_X_VERSION_MAX_ALLOWED" -ge 101500; then
+# The Bluetooth code doesn't compile with macOS SDK 10.15
+enable_sdremote_bluetooth=no
+fi
 # If not explicitly enabled or disabled, default
 if test -z "$enable_sdremote_bluetooth"; then
 case "$OS" in
diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk
index 67109b97c960..02642bf724d8 100644
--- a/sd/Library_sd.mk
+++ b/sd/Library_sd.mk
@@ -518,6 +518,10 @@ $(eval $(call gb_Library_add_objcxxobjects,sd,\
sd/source/ui/remotecontrol/OSXNetworkService \
 ))
 
+$(eval $(call gb_Library_use_system_darwin_frameworks,sd,\
+   Foundation \
+))
+
 else # OS!=MACSOX
 
 ifeq ($(ENABLE_AVAHI),TRUE)
@@ -566,7 +570,6 @@ $(eval $(call gb_Library_add_libs,sd,\
 ))
 
 $(eval $(call gb_Library_use_system_darwin_frameworks,sd,\
-   Foundation \
IOBluetooth \
 ))
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-11-04 Thread Tomoyuki Kubota (via logerrit)

 bridges/source/cpp_uno/msvc_win32_intel/except.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 523dcbd046f200785c78bc6b23f4c04e38f25f47
Author: Tomoyuki Kubota 
AuthorDate: Mon Nov 4 23:04:06 2019 +0900
Commit: Noel Grandin 
CommitDate: Tue Nov 5 07:25:29 2019 +0100

typeinfo fix for x86

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

diff --git a/bridges/source/cpp_uno/msvc_win32_intel/except.cxx 
b/bridges/source/cpp_uno/msvc_win32_intel/except.cxx
index 4f761ef3ed20..360abb038bec 100644
--- a/bridges/source/cpp_uno/msvc_win32_intel/except.cxx
+++ b/bridges/source/cpp_uno/msvc_win32_intel/except.cxx
@@ -20,7 +20,7 @@
 
 #include 
 #include 
-#include 
+#include 
 #include 
 
 #include 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 8 commits - basic/inc basic/source bin/find-can-be-private-symbols.py cppcanvas/source cui/source cui/uiconfig include/basegfx include/basic include/editeng include/sfx

2019-11-04 Thread Tomoyuki Kubota (via logerrit)

 basic/inc/sbxbase.hxx|2 
 basic/source/inc/sbintern.hxx|2 
 bin/find-can-be-private-symbols.py   |  120 +
 cppcanvas/source/mtfrenderer/transparencygroupaction.cxx |3 
 cui/source/dialogs/scriptdlg.cxx |1 
 cui/source/inc/macropg.hxx   |2 
 cui/uiconfig/ui/bulletandposition.ui | 1014 +++
 cui/uiconfig/ui/charnamepage.ui  |   11 
 cui/uiconfig/ui/gradientpage.ui  |2 
 cui/uiconfig/ui/hatchpage.ui |2 
 cui/uiconfig/ui/patterntabpage.ui|2 
 include/basegfx/color/bcolormodifier.hxx |   47 
 include/basic/sbdef.hxx  |2 
 include/editeng/unonrule.hxx |2 
 include/editeng/unotext.hxx  |6 
 include/sfx2/dockwin.hxx |2 
 include/sot/storinfo.hxx |2 
 include/svtools/sampletext.hxx   |   14 
 include/svx/sdrhittesthelper.hxx |2 
 include/svx/svdpntv.hxx  |2 
 include/svx/svdtrans.hxx |4 
 include/svx/unomodel.hxx |4 
 include/toolkit/helper/property.hxx  |2 
 include/tools/stream.hxx |2 
 include/tools/tenccvt.hxx|2 
 include/vcl/animate/Animation.hxx|4 
 include/vcl/bitmapex.hxx |2 
 include/vcl/checksum.hxx |2 
 include/vcl/gfxlink.hxx  |4 
 include/vcl/hatch.hxx|4 
 include/vcl/layout.hxx   |   10 
 include/vcl/lineinfo.hxx |4 
 include/vcl/mapmod.hxx   |4 
 include/vcl/status.hxx   |2 
 include/vcl/wall.hxx |4 
 oox/inc/ooxresid.hxx |2 
 oox/source/helper/ooxresid.cxx   |5 
 sc/inc/calcconfig.hxx|4 
 sc/source/ui/inc/searchresults.hxx   |1 
 sw/inc/dbgoutsw.hxx  |   46 
 sw/inc/pam.hxx   |8 
 sw/inc/redline.hxx   |2 
 sw/inc/swtypes.hxx   |4 
 sw/source/core/inc/pamtyp.hxx|2 
 sw/source/core/inc/tblrwcl.hxx   |2 
 sw/source/filter/inc/wrt_fn.hxx  |6 
 sw/source/uibase/inc/uitool.hxx  |4 
 vcl/inc/svdata.hxx   |4 
 vcl/inc/unx/gtk/atkbridge.hxx|4 
 vcl/inc/unx/x11/xlimits.hxx  |2 
 vcl/source/filter/igif/gifread.cxx   |2 
 vcl/source/filter/igif/gifread.hxx   |2 
 vcl/source/window/abstdlg.cxx|   23 
 xmlsecurity/inc/xmlsec/xmlstreamio.hxx   |8 
 xmlsecurity/source/xmlsec/xmlstreamio.cxx|8 
 55 files changed, 762 insertions(+), 671 deletions(-)

New commits:
commit f4544f3903fed3a656e3cd57e1bd83582e024b96
Author: Tomoyuki Kubota 
AuthorDate: Sun Nov 3 06:31:11 2019 +0900
Commit: Noel Grandin 
CommitDate: Sun Nov 3 16:11:26 2019 +0100

tdf#42949 restore vcl/canvastools.hxx for OSL_DEBUG_LEVEL > 2

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

diff --git a/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx 
b/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx
index da046a8f1a04..09e5c200d04d 100644
--- a/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx
+++ b/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx
@@ -50,6 +50,9 @@
 #include "mtftools.hxx"
 #include 
 
+#if OSL_DEBUG_LEVEL > 2
+#include 
+#endif
 
 using namespace ::com::sun::star;
 
commit 35425ba5d477ef6f278366fb93f3d66fbbc6421a
Author: Mike Kaganski 
AuthorDate: Sun Nov 3 12:44:06 2019 +0200
Commit: Mike Kaganski 
CommitDate: Sun Nov 3 13:46:04 2019 +0100

Only initialize function pointer once

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

diff --git

[Libreoffice-commits] core.git: 4 commits - bridges/source extras/source offapi/com

2019-09-24 Thread Tomoyuki Kubota (via logerrit)

 bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx |2 +-
 extras/source/autotext/lang/oc/standard/FN/content.xml  |6 +++---
 extras/source/autotext/lang/om/standard/FN/content.xml  |6 +++---
 offapi/com/sun/star/document/XShapeEventBroadcaster.idl |6 --
 offapi/com/sun/star/i18n/XCalendar4.idl |   10 ++
 5 files changed, 21 insertions(+), 9 deletions(-)

New commits:
commit 29ac4c2979c63f1892e9d53bd17c860ea9ce3345
Author: Tomoyuki Kubota 
AuthorDate: Tue Sep 24 23:35:06 2019 +0900
Commit: Noel Grandin 
CommitDate: Tue Sep 24 21:45:59 2019 +0200

latest update of Visual Studio complains about typeinfo.h

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

diff --git a/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx 
b/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx
index 8d49ff6dafd1..9934714eecab 100644
--- a/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx
+++ b/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx
@@ -240,7 +240,7 @@ void
 
 #include 
 #include 
-#include 
+#include 
 #include 
 
 #include 
commit fe5c74ea22ec3b61bd1208ab7d1a16b25582dd9f
Author: Laurent BP 
AuthorDate: Sun Sep 15 16:14:25 2019 +0200
Commit: Laurent BP 
CommitDate: Tue Sep 24 21:45:40 2019 +0200

Improve FN AutoText for om

Translate names which appear in Navigator

Change-Id: Iaae0f7e71251bdb206c3d7f59f78a34672b7fc14
Reviewed-on: https://gerrit.libreoffice.org/78935
Tested-by: Jenkins
Reviewed-by: Laurent BP 

diff --git a/extras/source/autotext/lang/om/standard/FN/content.xml 
b/extras/source/autotext/lang/om/standard/FN/content.xml
index b41b40baf853..c1327a65aa6a 100644
--- a/extras/source/autotext/lang/om/standard/FN/content.xml
+++ b/extras/source/autotext/lang/om/standard/FN/content.xml
@@ -34,13 +34,13 @@
 
 

-   
+   
 
 
 
  
   
-   
+   
  formula
 
   
@@ -52,4 +52,4 @@

   
  
-
\ No newline at end of file
+
commit bd776896c2035f5b247365f2d3b8442272d0731c
Author: Tomoyuki Kubota 
AuthorDate: Wed Sep 25 00:12:09 2019 +0900
Commit: Noel Grandin 
CommitDate: Tue Sep 24 21:45:26 2019 +0200

doxygen warns on missing annotations for the parameters

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

diff --git a/offapi/com/sun/star/document/XShapeEventBroadcaster.idl 
b/offapi/com/sun/star/document/XShapeEventBroadcaster.idl
index 52e49ec8e96b..78a227eb993b 100644
--- a/offapi/com/sun/star/document/XShapeEventBroadcaster.idl
+++ b/offapi/com/sun/star/document/XShapeEventBroadcaster.idl
@@ -33,14 +33,16 @@ module com {   module sun {   module star {   module 
document {
 interface XShapeEventBroadcaster : com::sun::star::document::XEventBroadcaster
 {
 /** registers the given listener
-
+@param Shape
+the shape to be listened
 @param Listener
 listener which is interested on such events
  */
 void addShapeEventListener( [in] com::sun::star::drawing::XShape Shape, 
[in] XShapeEventListener Listener );
 
 /** unregisters the given listener
-
+@param Shape
+the shape with the listener to be removed
 @param Listener
 listener which isn't interested on such events any longer
  */
diff --git a/offapi/com/sun/star/i18n/XCalendar4.idl 
b/offapi/com/sun/star/i18n/XCalendar4.idl
index 94686b4a0031..7243cea65d76 100644
--- a/offapi/com/sun/star/i18n/XCalendar4.idl
+++ b/offapi/com/sun/star/i18n/XCalendar4.idl
@@ -51,6 +51,8 @@ interface XCalendar4 : com::sun::star::i18n::XCalendar3
 
 /** Load the default calendar for the given locale with a given time zone.
 
+@param  rLocale
+the locale for the calendar
 @param  TimeZone
 If empty, the system's time zone is used.
 Else specified as "Region/City" name like "Europe/Berlin",
@@ -62,6 +64,14 @@ interface XCalendar4 : com::sun::star::i18n::XCalendar3
 
 /** Load a specific calendar for the given locale with a given time zone.
 
+@param  uniqueID
+the uniqueID for the calendar.
+As of 2019-09-25, we can specify ROC, dangi, buddhist, gengou,
+gregorian, hanja, hanja_yoil, hijri, jewish.
+If the calendar for the specified uniqueID is not found,
+gregorian is used.
+@param  rLocale
+the locale for the calendar
 @param  TimeZone
 If empty, the system's time zone is used.
 Else specified as "Region/City" name like "Europe/Berlin",
commit 1a13394cdd7f8c862c02356bda7f4ba54e914c8a
Author: Laurent BP 
AuthorDate: Sun Sep 15 16:10:39 2019 +0200

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

2019-09-17 Thread Tomoyuki Kubota (via logerrit)

 basic/qa/basic_coverage/test_optional_paramter_type.vb |   33 +
 basic/source/runtime/runtime.cxx   |2 -
 2 files changed, 34 insertions(+), 1 deletion(-)

New commits:
commit ff6383face219970a0435b008a0439643a61043e
Author: Tomoyuki Kubota 
AuthorDate: Tue Sep 17 21:24:50 2019 +0900
Commit: Noel Grandin 
CommitDate: Tue Sep 17 16:33:33 2019 +0200

tdf#118544 set correct type for optional parameter

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

diff --git a/basic/qa/basic_coverage/test_optional_paramter_type.vb 
b/basic/qa/basic_coverage/test_optional_paramter_type.vb
new file mode 100755
index ..37198ea38244
--- /dev/null
+++ b/basic/qa/basic_coverage/test_optional_paramter_type.vb
@@ -0,0 +1,33 @@
+REM  *  BASIC  *
+Option Compatible
+
+Function doUnitTest() As Integer
+doUnitTest = 0
+If CheckType1(32) = 0 Then
+Exit Function
+End If
+If CheckType2(32) = 0 Then
+Exit Function
+End If
+If CheckType2() = 0 Then
+Exit Function
+End If
+doUnitTest = 1
+End Function
+
+Function CheckType1(x As Integer) As Integer
+If TypeName(x) = "Integer" Then
+ CheckType1 = 1
+Else
+ CheckType1 = 0
+End If
+End Function
+
+
+Function CheckType2(Optional y As Integer = 32 ) As Integer
+If TypeName(y) = "Integer" Then
+CheckType2 = 1
+Else
+CheckType2 = 0
+End If
+End Function
\ No newline at end of file
diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx
old mode 100644
new mode 100755
index 74fe533bd4a5..59daf1531d2a
--- a/basic/source/runtime/runtime.cxx
+++ b/basic/source/runtime/runtime.cxx
@@ -4040,7 +4040,7 @@ void SbiRuntime::StepPARAM( sal_uInt32 nOp1, sal_uInt32 
nOp2 )
 if( nDefaultId > 0 )
 {
 OUString aDefaultStr = pImg->GetString( nDefaultId );
-p = new SbxVariable();
+p = new SbxVariable(pParam-> eType);
 p->PutString( aDefaultStr );
 refParams->Put( p, i );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/ct2n

2019-08-15 Thread Tomoyuki Kubota (via logerrit)

 external/ct2n/ConvertTextToNumber-1.5.0-add-namespace-prefix.patch |   10 
++
 external/ct2n/UnpackedTarball_ct2n.mk  |1 +
 2 files changed, 11 insertions(+)

New commits:
commit d72f68e91b595d1a8120f39b80483c3f06838099
Author: Tomoyuki Kubota 
AuthorDate: Wed Aug 14 21:08:47 2019 +0900
Commit: Stephan Bergmann 
CommitDate: Thu Aug 15 08:50:38 2019 +0200

ct2n:add namespace declaration for manifest prefix

Change-Id: Ib269c88e530c3b23aa370abbbd603f34b0eda012
Reviewed-on: https://gerrit.libreoffice.org/77462
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/external/ct2n/ConvertTextToNumber-1.5.0-add-namespace-prefix.patch 
b/external/ct2n/ConvertTextToNumber-1.5.0-add-namespace-prefix.patch
new file mode 100644
index ..8602989f7d7b
--- /dev/null
+++ b/external/ct2n/ConvertTextToNumber-1.5.0-add-namespace-prefix.patch
@@ -0,0 +1,10 @@
+diff -purN misc/META-INF/manifest.xml misc/build/META-INF/manifest.xml
+--- misc/META-INF/manifest.xml 2019-08-14 20:57:00.0 +0900
 misc/build/META-INF/manifest.xml   2019-08-14 20:58:00.0 +0900
+@@ -1,5 +1,5 @@
+ 
+-
++http://openoffice.org/2001/manifest;>
+  
+  
+  
diff --git a/external/ct2n/UnpackedTarball_ct2n.mk 
b/external/ct2n/UnpackedTarball_ct2n.mk
index 2b3374532842..38cfb6743896 100644
--- a/external/ct2n/UnpackedTarball_ct2n.mk
+++ b/external/ct2n/UnpackedTarball_ct2n.mk
@@ -14,6 +14,7 @@ $(eval $(call 
gb_UnpackedTarball_set_tarball,ct2n,$(CT2N_TARBALL),0))
 $(eval $(call gb_UnpackedTarball_add_patches,ct2n,\
external/ct2n/ConvertTextToNumber-1.3.2-no-license.patch \
external/ct2n/ConvertTextToNumber-1.3.2-no-visible-by-default.patch \
+   external/ct2n/ConvertTextToNumber-1.5.0-add-namespace-prefix.patch \
 ))
 
 $(eval $(call gb_UnpackedTarball_fix_end_of_line,ct2n,\
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-06-29 Thread Tomoyuki Kubota (via logerrit)

 basic/source/basmgr/basmgr.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 00f4722032cd3abb02180d2df6b9cb580736cb7c
Author: Tomoyuki Kubota 
AuthorDate: Wed May 29 12:41:30 2019 +0900
Commit: Noel Grandin 
CommitDate: Sat Jun 29 08:30:15 2019 +0200

tdf#125564: WatchWindow should report correct type for global constants

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

diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx
index 88e12775f6ce..71674e7825d0 100644
--- a/basic/source/basmgr/basmgr.cxx
+++ b/basic/source/basmgr/basmgr.cxx
@@ -1404,8 +1404,8 @@ uno::Any BasicManager::SetGlobalUNOConstant( const 
OUString& rName, const uno::A
 SbxVariable* pVariable = pStandardLib->Find( rName, SbxClassType::Object );
 if ( pVariable )
 aOldValue = sbxToUnoValue( pVariable );
-
-SbxObjectRef xUnoObj = GetSbUnoObject( rName, _rValue );
+SbxObjectRef xUnoObj = GetSbUnoObject( _rValue.getValueType ().getTypeName 
() , _rValue );
+xUnoObj->SetName(rName);
 xUnoObj->SetFlag( SbxFlagBits::DontStore );
 pStandardLib->Insert( xUnoObj.get() );
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-06-13 Thread Tomoyuki Kubota (via logerrit)

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

New commits:
commit 78b4c7ae30926d1c908c4d67f7ebc6b0565ea200
Author: Tomoyuki Kubota 
AuthorDate: Wed Jun 12 02:39:56 2019 +0900
Commit: Luboš Luňák 
CommitDate: Thu Jun 13 11:04:46 2019 +0200

test command does not do short-circuit evaluation

Change-Id: Iaaeb479698c79f2cea3fd2e3914c17d3a2692981
Reviewed-on: https://gerrit.libreoffice.org/73837
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 

diff --git a/configure.ac b/configure.ac
index 2586ca81c1bf..f8c63cc778d0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10347,7 +10347,7 @@ if test -n "$enable_sdremote" -a "$enable_sdremote" != 
"no"; then
 ENABLE_SDREMOTE=TRUE
 AC_MSG_CHECKING([whether to enable Bluetooth support in Impress remote 
control])
 
-if test $OS = MACOSX -a "$MAC_OS_X_VERSION_MAX_ALLOWED" -ge 101500; then
+if test $OS = MACOSX && test "$MAC_OS_X_VERSION_MAX_ALLOWED" -ge 101500; 
then
 # The Bluetooth code doesn't compile with macOS SDK 10.15
 enable_sdremote_bluetooth=no
 fi
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-06-12 Thread Tomoyuki Kubota (via logerrit)

 include/rtl/character.hxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 725b744c8c1ebf87c5a35aff7f99e74a589e929a
Author: Tomoyuki Kubota 
AuthorDate: Wed Jun 12 02:35:36 2019 +0900
Commit: Noel Grandin 
CommitDate: Wed Jun 12 08:06:50 2019 +0200

the variable names are not code,but nCode

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

diff --git a/include/rtl/character.hxx b/include/rtl/character.hxx
index 2a8933668964..102c411cb79a 100644
--- a/include/rtl/character.hxx
+++ b/include/rtl/character.hxx
@@ -59,7 +59,7 @@ inline bool isAscii(sal_uInt32 code)
 
 /** Check for Unicode variation sequence selectors
 
-@param code  A Unicode code point.
+@param nCode  A Unicode code point.
 
 @return  True if code is an Unicode variation sequence selector.
 
@@ -73,7 +73,7 @@ inline bool isIVSSelector(sal_uInt32 nCode)
 
 /** Check for base characters of a CJK ideographic variation sequence (IVS)
 
-@param code  A Unicode code point.
+@param nCode  A Unicode code point.
 
 @return  True if code is an Unicode base character part of CJK IVS
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bean/com javaunohelper/com jurt/com qadevOOo/runner ridljar/com svl/qa

2019-05-27 Thread Tomoyuki Kubota (via logerrit)

 bean/com/sun/star/comp/beans/NativeConnection.java|1 
 bean/com/sun/star/comp/beans/NativeService.java   |1 
 bean/com/sun/star/comp/beans/OOoBean.java |   15 
++
 javaunohelper/com/sun/star/comp/helper/SharedLibraryLoader.java   |1 
 jurt/com/sun/star/comp/loader/FactoryHelper.java  |1 
 jurt/com/sun/star/lib/uno/bridges/java_remote/java_remote_bridge.java |1 
 jurt/com/sun/star/uno/Ascii.java  |2 +
 jurt/com/sun/star/uno/AsciiString.java|2 +
 jurt/com/sun/star/uno/MappingException.java   |1 
 qadevOOo/runner/lib/DynamicClassLoader.java   |1 
 ridljar/com/sun/star/lib/uno/typeinfo/ConstantTypeInfo.java   |1 
 ridljar/com/sun/star/uno/Any.java |1 
 ridljar/com/sun/star/uno/IBridge.java |1 
 ridljar/com/sun/star/uno/IEnvironment.java|1 
 ridljar/com/sun/star/uno/IMapping.java|1 
 ridljar/com/sun/star/uno/UnoRuntime.java  |9 
++
 svl/qa/complex/ConfigItems/CheckConfigItems.java  |1 
 17 files changed, 41 insertions(+)

New commits:
commit 51f1e62e2dae37746d218a187d4b0158296ad155
Author: Tomoyuki Kubota 
AuthorDate: Fri May 24 19:24:10 2019 +0900
Commit: Michael Stahl 
CommitDate: Mon May 27 11:40:35 2019 +0200

@deprecated should be with @Deprecated

Without this patch, warnings will be given
when LibreOffice is built with JDK9 or later.

Change-Id: I7aa6e99ace2377fbdb7dd732949ce10d9bd9df58
Reviewed-on: https://gerrit.libreoffice.org/72947
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/bean/com/sun/star/comp/beans/NativeConnection.java 
b/bean/com/sun/star/comp/beans/NativeConnection.java
index eebae5d40609..dd253134efb8 100644
--- a/bean/com/sun/star/comp/beans/NativeConnection.java
+++ b/bean/com/sun/star/comp/beans/NativeConnection.java
@@ -24,6 +24,7 @@ import com.sun.star.connection.XConnection;
  *
  * @deprecated.
  */
+@Deprecated
 class NativeConnection
 implements XConnection
 {
diff --git a/bean/com/sun/star/comp/beans/NativeService.java 
b/bean/com/sun/star/comp/beans/NativeService.java
index 9df62f072976..c1e8282964a7 100644
--- a/bean/com/sun/star/comp/beans/NativeService.java
+++ b/bean/com/sun/star/comp/beans/NativeService.java
@@ -21,6 +21,7 @@ package com.sun.star.comp.beans;
 /*
  * @deprecated
  */
+@Deprecated
 interface NativeService {
 String getIdentifier();
 void startupService() throws java.io.IOException;
diff --git a/bean/com/sun/star/comp/beans/OOoBean.java 
b/bean/com/sun/star/comp/beans/OOoBean.java
index 606b627abf77..345d5614c266 100644
--- a/bean/com/sun/star/comp/beans/OOoBean.java
+++ b/bean/com/sun/star/comp/beans/OOoBean.java
@@ -119,6 +119,7 @@ public class OOoBean
 the dispose method of the OfficeConnection or the OOoBean's 
stopOOoConnection
 method would make all instances of OOoBean stop working.
  */
+@Deprecated
 public OOoBean( OfficeConnection iConnection )
 throws NoConnectionException
 {
@@ -212,6 +213,7 @@ public class OOoBean
 make is method work. It is better to call OOoBean's methods and be 
prepared
 to catch a NoConnectionException.
  */
+@Deprecated
 public boolean isOOoConnected()
 {
 return iConnection != null;
@@ -353,6 +355,7 @@ public class OOoBean
 should call the clearDocument of the deriving class or {@link #clear} 
which discards
 the currently displayed document.
  */
+@Deprecated
 public synchronized void clearDocument( boolean bClearStateToo )
 {
 // TBD
@@ -488,6 +491,7 @@ public class OOoBean
 office window is called, then the actions are performed for which this 
method
 needed to be called previously.
  */
+@Deprecated
 public synchronized void releaseSystemWindow()
 throws
 SystemWindowException,
@@ -1024,6 +1028,7 @@ com.sun.star.frame.XLayoutManager xLayoutManager =
 xLayoutManager.showElement("private:resource/menubar/menubar");
 
  */
+@Deprecated
 public void setAllBarsVisible( boolean bVisible )
 {
 bIgnoreVisibility = true;
@@ -1041,6 +1046,7 @@ 
xLayoutManager.showElement("private:resource/menubar/menubar");
 which can be obtained from a frame, to control toolbars. See also
 {@link #setAllBarsVisible setAllBarsVisible}.
  */
+@Deprecated
 protected void applyToolVisibilities()
 {
 bIgnoreVisibility = true;
@@ -1061,6 +1067,7 @@ 
xLayoutManager.showElement("private:resource/menubar/menubar");
 which can be obtained from a frame, to control toolbars. See

[Libreoffice-commits] core.git: odk/docs

2019-05-09 Thread Tomoyuki Kubota (via logerrit)

 odk/docs/cpp/Doxyfile |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f20b8e793f6816c354eb8853dc0a2a1594784b7e
Author: Tomoyuki Kubota 
AuthorDate: Sun Apr 7 20:56:32 2019 +0900
Commit: Michael Stahl 
CommitDate: Thu May 9 11:29:42 2019 +0200

par command does not allow n command in its first line(title)

Doxygen used to allow this but there was a regression, which is
apparently not being fixed:
https://github.com/doxygen/doxygen/issues/6304

Change-Id: I7602236522a56c30a2249bd8065796b3c6458704
Reviewed-on: https://gerrit.libreoffice.org/70377
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/odk/docs/cpp/Doxyfile b/odk/docs/cpp/Doxyfile
index 1bb4ddd4284b..6ea291782a79 100644
--- a/odk/docs/cpp/Doxyfile
+++ b/odk/docs/cpp/Doxyfile
@@ -30,7 +30,7 @@ HTML_TIMESTAMP = NO
 
 GENERATE_LATEX = NO
 
-ALIASES = "derive=\par Derive: \n"
+ALIASES = "derive=\par Derive:"
 
 MACRO_EXPANSION = YES
 EXPAND_ONLY_PREDEF = YES
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-05-03 Thread Tomoyuki Kubota (via logerrit)

 configure.ac |   25 -
 1 file changed, 8 insertions(+), 17 deletions(-)

New commits:
commit 4bf62c1c04de1100e3f6fb3d5173eff2cb101fa6
Author: Tomoyuki Kubota 
AuthorDate: Thu Apr 25 08:38:56 2019 +0900
Commit: Mike Kaganski 
CommitDate: Fri May 3 14:03:42 2019 +0200

Add Support for .NET 4.8

*Before this patch, Windows SDK came with .NET 4.5
and .NET 4.6.1 or later was ignored.

* the author of this configure.ac did not seem to understand that
WOW6432Node should be given to reg_get_value_64
instead of reg_get_value_32.
sometimes the code redundantly fetched the same entry WOW6432
(for 64 bit, wrongly passed to 32bit)
and the 32 bit one. I removed the duplicate.

Change-Id: Iff972d727907c480ef927d53fa1f53557fdeb1fd
Reviewed-on: https://gerrit.libreoffice.org/71268
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 
Reviewed-by: Mike Kaganski 

diff --git a/configure.ac b/configure.ac
index 36e0c359dedf..a0cf4cda626f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5350,40 +5350,31 @@ find_al()
 
 unset altest
 
-for x in `ls 
/proc/registry32/HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Microsoft\ 
SDKs/Windows`; do
-reg_get_value_32 "HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Microsoft 
SDKs/Windows/$x/WinSDK-NetFx40Tools/InstallationFolder"
-if test -n "$regvalue" -a \( -f "$regvalue/al.exe" -o -f 
"$regvalue/bin/al.exe" \); then
-altest=$regvalue
-return
-fi
-done
-
-# We need this additional check to detect 4.6.1 or above.
-for ver in 4.7.2 4.7.1 4.7 4.6.2 4.6.1; do
+# We need this check to detect 4.6.1 or above.
+for ver in 4.8 4.7.2 4.7.1 4.7 4.6.2 4.6.1; do
 reg_get_value_32 "HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Microsoft 
SDKs/NETFXSDK/$ver/WinSDK-NetFx40Tools/InstallationFolder"
 if test -n "$regvalue" -a \( -f "$regvalue/al.exe" -o -f 
"$regvalue/bin/al.exe" \); then
 altest=$regvalue
 return
 fi
+done
 
-reg_get_value_32 
"HKEY_LOCAL_MACHINE/SOFTWARE/WOW6432Node/Microsoft/Microsoft 
SDKs/NETFXSDK/$ver/WinSDK-NetFx40Tools"
+for x in `ls 
/proc/registry32/HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Microsoft\ 
SDKs/Windows`; do
+reg_get_value_32 "HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Microsoft 
SDKs/Windows/$x/WinSDK-NetFx40Tools/InstallationFolder"
 if test -n "$regvalue" -a \( -f "$regvalue/al.exe" -o -f 
"$regvalue/bin/al.exe" \); then
 altest=$regvalue
 return
 fi
 done
+
+
 }
 
 find_dotnetsdk46()
 {
 unset frametest
 
-for ver in 4.7.2 4.7.1 4.7 4.6.2 4.6.1 4.6; do
-reg_get_value_64 
"HKEY_LOCAL_MACHINE/SOFTWARE/Wow6432Node/Microsoft/Microsoft 
SDKs/NETFXSDK/$ver/KitsInstallationFolder"
-if test -n "$regvalue"; then
-frametest=$regvalue
-return
-fi
+for ver in 4.8 4.7.2 4.7.1 4.7 4.6.2 4.6.1 4.6; do
 reg_get_value_32 "HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Microsoft 
SDKs/NETFXSDK/$ver/KitsInstallationFolder"
 if test -n "$regvalue"; then
 frametest=$regvalue
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: basctl/source basic/source

2019-04-23 Thread Tomoyuki Kubota (via logerrit)

 basctl/source/basicide/baside2b.cxx |8 
 basic/source/sbx/sbxvar.cxx |2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 47d25dc5abe000ce751cb1e4dbd1f85f7198ca05
Author: Tomoyuki Kubota 
AuthorDate: Sat Apr 20 22:46:27 2019 +0900
Commit: Michael Stahl 
CommitDate: Tue Apr 23 12:51:51 2019 +0200

tdf#123043 make type character detection unicode-aware

Change-Id: I98886a7d13a43cc3202d45f96ceb5062f76f0784
Reviewed-on: https://gerrit.libreoffice.org/71013
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/basctl/source/basicide/baside2b.cxx 
b/basctl/source/basicide/baside2b.cxx
index b18ef9ab1190..2e3425da97ce 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -92,7 +92,7 @@ int const nScrollLine = 12;
 int const nScrollPage = 60;
 int const DWBORDER = 3;
 
-char const cSuffixes[] = "%&!#@$";
+OUString const cSuffixes {"%&!#@$"};
 
 } // namespace
 
@@ -166,13 +166,13 @@ void lcl_SeparateNameAndIndex( const OUString& rVName, 
OUString& rVar, OUString&
 if ( !rVar.isEmpty() )
 {
 sal_uInt16 nLastChar = rVar.getLength()-1;
-if ( strchr( cSuffixes, rVar[ nLastChar ] ) )
+if ( cSuffixes.indexOf(rVar[ nLastChar ] ) >= 0 )
 rVar = rVar.replaceAt( nLastChar, 1, "" );
 }
 if ( !rIndex.isEmpty() )
 {
 sal_uInt16 nLastChar = rIndex.getLength()-1;
-if ( strchr( cSuffixes, rIndex[ nLastChar ] ) )
+if ( cSuffixes.indexOf(rIndex[ nLastChar ] ) >=0 )
 rIndex = rIndex.replaceAt( nLastChar, 1, "" );
 }
 }
@@ -355,7 +355,7 @@ void EditorWindow::RequestHelp( const HelpEvent& rHEvt )
 if ( !aWord.isEmpty() && 
!comphelper::string::isdigitAsciiString(aWord) )
 {
 sal_uInt16 nLastChar = aWord.getLength() - 1;
-if ( strchr( cSuffixes, aWord[ nLastChar ] ) )
+if ( cSuffixes.indexOf(aWord[ nLastChar ] ) >= 0 )
 aWord = aWord.replaceAt( nLastChar, 1, "" );
 SbxBase* pSBX = StarBASIC::FindSBXInCurrentScope( aWord );
 if (SbxVariable const* pVar = IsSbxVariable(pSBX))
diff --git a/basic/source/sbx/sbxvar.cxx b/basic/source/sbx/sbxvar.cxx
index ec67be889e3a..bab30af36989 100644
--- a/basic/source/sbx/sbxvar.cxx
+++ b/basic/source/sbx/sbxvar.cxx
@@ -220,7 +220,7 @@ void SbxVariable::SetName( const OUString& rName )
 
 const OUString& SbxVariable::GetName( SbxNameType t ) const
 {
-static const char cSuffixes[] = "  %&!#@ $";
+static const OUString cSuffixes { "  %&!#@ $" };
 if( t == SbxNameType::NONE )
 {
 return maName;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/redland

2019-04-17 Thread Tomoyuki Kubota (via logerrit)

 external/redland/Library_raptor.mk|2 +
 external/redland/Library_rasqal.mk|6 +
 external/redland/raptor/raptor-msvc.patch.1   |   13 +++
 external/redland/rasqal/rasqal-msvc.patch.1   |   15 +
 external/redland/redland/redland-msvc.patch.1 |   29 ++
 5 files changed, 65 insertions(+)

New commits:
commit a96167f88aa68651f055aa9096e63c9e48c8e4fa
Author: Tomoyuki Kubota 
AuthorDate: Tue Apr 16 22:23:32 2019 +0900
Commit: Michael Stahl 
CommitDate: Wed Apr 17 11:00:32 2019 +0200

avoid C4013 and C4117

calloc,free,clock,time,ceil,frexp,fabs,ldex,access,getpid for C4013
__FUNCTION__ for C4117

Change-Id: I71e1894893f3aa9cf0e5ac699e44586144a14743
Reviewed-on: https://gerrit.libreoffice.org/70423
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/external/redland/Library_raptor.mk 
b/external/redland/Library_raptor.mk
index 1f171c1bc752..146a46e90cfe 100644
--- a/external/redland/Library_raptor.mk
+++ b/external/redland/Library_raptor.mk
@@ -32,6 +32,8 @@ $(eval $(call gb_Library_add_defs,raptor2,\
-D_USRDLL \
-DWIN32_EXPORTS \
-DYY_NO_UNISTD_H \
+   -DHAVE__ACCESS \
+   -UHAVE_ACCESS \
 ))
 
 $(eval $(call gb_Library_add_generated_cobjects,raptor2,\
diff --git a/external/redland/Library_rasqal.mk 
b/external/redland/Library_rasqal.mk
index a62a5491b721..46b37c2116a3 100644
--- a/external/redland/Library_rasqal.mk
+++ b/external/redland/Library_rasqal.mk
@@ -26,6 +26,12 @@ $(eval $(call gb_Library_add_defs,rasqal,\
-D_USRDLL \
-DWIN32_EXPORTS \
-D_MT \
+   -DHAVE_STDLIB_H \
+   -DHAVE_STDINT_H \
+   -DHAVE_TIME_H \
+   -DHAVE_MATH_H \
+   -DHAVE_FLOAT_H \
+   -DHAVE___FUNCTION__ \
 ))
 
 $(eval $(call gb_Library_set_include,rasqal,\
diff --git a/external/redland/raptor/raptor-msvc.patch.1 
b/external/redland/raptor/raptor-msvc.patch.1
index e62f4d005fec..245b19bdca70 100644
--- a/external/redland/raptor/raptor-msvc.patch.1
+++ b/external/redland/raptor/raptor-msvc.patch.1
@@ -8,3 +8,16 @@
  void raptor_sort_r(void *base, size_t nel, size_t width, 
raptor_data_compare_arg_handler compar, void *user_data);
  
  
+--- raptor/src/raptor_uri.c2016-08-26 23:45:34.543400074 +0200
 raptor/src/raptor_uri.c2016-08-26 23:45:40.479399614 +0200
+@@ -51,6 +51,10 @@
+ #include 
+ #endif
+ 
++#if !defined(HAVE_ACCESS) && defined(HAVE__ACCESS)
++#include 
++#endif
++
+ /* Raptor includes */
+ #include "raptor2.h"
+ #include "raptor_internal.h"
diff --git a/external/redland/rasqal/rasqal-msvc.patch.1 
b/external/redland/rasqal/rasqal-msvc.patch.1
index fbdaf32b25a7..f32f6720b8e1 100644
--- a/external/redland/rasqal/rasqal-msvc.patch.1
+++ b/external/redland/rasqal/rasqal-msvc.patch.1
@@ -9,6 +9,21 @@ diff -ru rasqal.orig/src/win32_rasqal_config.h 
rasqal/src/win32_rasqal_config.h
  #define access _access
  #define stricmp _stricmp
  #define strnicmp _strnicmp
+@@ -42,10 +43,10 @@
+ int rasqal_gettimeofday(struct timeval *tv, struct timezone *tz);
+ #undef HAVE_GETTIMEOFDAY
+ 
+-#include 
+-#define isnan(n) _isnan(n)
+-/* no round function available */
+-#define round(x) floor(x+0.5)
++// #include 
++// #define isnan(n) _isnan(n)
++// /* no round function available */
++// #define round(x) floor(x+0.5)
+ 
+ /* These are SPARQL token definitions */
+ #ifdef OPTIONAL
 --- rasqal/src/rasqal_ntriples.c.orig  2016-08-26 23:29:58.343472683 +0200
 +++ rasqal/src/rasqal_ntriples.c   2016-08-26 23:30:10.553471736 +0200
 @@ -25,6 +25,10 @@
diff --git a/external/redland/redland/redland-msvc.patch.1 
b/external/redland/redland/redland-msvc.patch.1
index 1b170989fd1e..1cdc6cf48775 100644
--- a/external/redland/redland/redland-msvc.patch.1
+++ b/external/redland/redland/redland-msvc.patch.1
@@ -93,3 +93,32 @@
  
  /* Building 3store storage */
  /*#undef STORAGE_TSTORE*/
+@@ -288,11 +288,11 @@
+ #include 
+ #include 
+ 
+-/* get _isnan() since it is not in math.h */
+-#include 
+-#ifndef isnan
+-#define isnan(d) (_isnan(d))
+-#endif
++// /* get _isnan() since it is not in math.h */
++// #include 
++// #ifndef isnan
++// #define isnan(d) (_isnan(d))
++// #endif
+ 
+ #ifdef __cplusplus
+ }
+--- redland.orig/src/rdf_init.c2015-09-02 23:12:12.894126138 +0200
 redland/src/rdf_init.c 2015-09-02 23:23:54.600173246 +0200
+@@ -42,6 +42,8 @@
+ #endif
+ #ifdef HAVE_UNISTD_H
+ #include  /* for getpid() */
++#else
++#include 
+ #endif
+ 
+ /* for gettimeofday */
+ 
\ No newline at end of file
___
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 configure.ac external/coinmp external/cppunit external/lcms2 external/python3

2019-04-16 Thread Tomoyuki Kubota (via logerrit)

 basic/CppunitTest_basic_macros.mk   |2 
 configure.ac|   85 +++-
 external/coinmp/ExternalProject_coinmp.mk   |3 
 external/cppunit/ExternalProject_cppunit.mk |3 
 external/lcms2/ExternalProject_lcms2.mk |5 -
 external/python3/ExternalProject_python3.mk |3 
 6 files changed, 58 insertions(+), 43 deletions(-)

New commits:
commit f61d6474205793b0838d90b09037cef52408a4b9
Author: Tomoyuki Kubota 
AuthorDate: Fri Feb 22 15:35:39 2019 +0900
Commit: Michael Stahl 
CommitDate: Tue Apr 16 13:01:03 2019 +0200

Initial VS 2019 Support

Change-Id: I8e08efb549ebd52c37183a1185d6de73f2b00601
Reviewed-on: https://gerrit.libreoffice.org/64630
Reviewed-by: himajin10 
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/basic/CppunitTest_basic_macros.mk 
b/basic/CppunitTest_basic_macros.mk
index e86c3dae27e4..7b9aed16dfaf 100644
--- a/basic/CppunitTest_basic_macros.mk
+++ b/basic/CppunitTest_basic_macros.mk
@@ -41,7 +41,7 @@ $(eval $(call gb_CppunitTest_use_libraries,basic_macros, \
 ifeq ($(OS),WNT)
 $(eval $(call gb_CppunitTest_use_system_win32_libs,basic_macros, \
oleaut32 \
-   $(if $(filter 150,$(VCVER)),legacy_stdio_definitions) \
+   $(if $(filter 150 160,$(VCVER)),legacy_stdio_definitions) \
odbc32 \
odbccp32 \
 ))
diff --git a/configure.ac b/configure.ac
index 2d62af9981a9..71e75103d38f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3199,7 +3199,9 @@ map_vs_year_to_version()
 
 case $1 in
 2017)
-vsversion=15.0;;
+vsversion=15;;
+2019)
+vsversion=16;;
 *)
 AC_MSG_ERROR([Assertion failure - invalid argument "$1" to 
map_vs_year_to_version()]);;
 esac
@@ -3217,7 +3219,7 @@ vs_versions_to_check()
 vsversions=$vsversion
 else
 # We accept only 2017
-vsversions="15.0"
+vsversions="15"
 fi
 }
 
@@ -3269,37 +3271,40 @@ find_ucrt()
 
 find_msvc()
 {
-# Find Visual C++ 2017
+# Find Visual C++ 2017/2019
 # Args: $1 (optional) : The VS version year
 # Return values: $vctest, $vcyear, $vcnum, $vcnumwithdot, $vcbuildnumber
 
 unset vctest vcnum vcnumwithdot vcbuildnumber
 
 vs_versions_to_check "$1"
-
+vswhere="$(perl -e 'print $ENV{"ProgramFiles(x86)"}')"
+vswhere+="\\Microsoft Visual Studio\\Installer\\vswhere.exe"
+PathFormat "$vswhere"
+vswhere=$formatted_path
 for ver in $vsversions; do
-reg_get_value_32 
HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/VisualStudio/$ver/Setup/VC/ProductDir
-if test -n "$regvalue"; then
-vctest=$regvalue
-break
-fi
-reg_get_value_32 
HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/VisualStudio/SxS/VS7/$ver
-if test -n "$regvalue"; then
-AC_MSG_RESULT([found: $regvalue])
-PathFormat "$regvalue"
+vswhereoutput=`$vswhere -version "@<:@ $ver , $(expr $ver + 1) @:}@" 
-requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property 
installationPath | head -1`
+if test -n "$vswhereoutput"; then
+PathFormat "$vswhereoutput"
 vctest=$formatted_path
 break
 fi
 done
+
 if test -n "$vctest"; then
-vcnumwithdot=$ver
+vcnumwithdot="$ver.0"
 case "$vcnumwithdot" in
 15.0)
 vcyear=2017
 vcnum=150
-vcbuildnumber=`ls $vctest/VC/Tools/MSVC -A1r | head -1`
+;;
+16.0)
+vcyear=2019
+vcnum=160
 ;;
 esac
+vcbuildnumber=`ls $vctest/VC/Tools/MSVC -A1r | head -1`
+
 fi
 }
 
@@ -3308,7 +3313,6 @@ MSBUILD_PATH=
 DEVENV=
 if test "$_os" = "WINNT"; then
 AC_MSG_CHECKING([Visual C++])
-
 find_msvc "$with_visual_studio"
 if test -z "$vctest"; then
 if test -n "$with_visual_studio"; then
@@ -3367,13 +3371,21 @@ if test "$_os" = "WINNT"; then
 AC_MSG_RESULT([found: $regvalue])
 MSBUILD_PATH=`win_short_path_for_make "$regvalue"`
 else
-if test "$BITNESS_OVERRIDE" = ""; then
-regvalue="$VC_PRODUCT_DIR/../MSBuild/$vcnumwithdot/Bin"
+if test "$vcnumwithdot" = "16.0"; then
+if test "$BITNESS_OVERRIDE" = ""; then
+regvalue="$VC_PRODUCT_DIR/../MSBuild/Current/Bin"
+else
+regvalue="$VC_PRODUCT_DIR/../MSBuild/Current/Bin/amd64"
+fi
 else
-regvalue="$VC_PRODUCT_DIR/../MSBuild/$vcnumwithdot/Bin/amd64"
+if test "$BITNESS_OVERRIDE" = ""; then
+regvalue="$VC_PRODUCT_DIR/../MSBuild/$vcnumwithdot/Bin"
+else
+regvalue="$VC_PRODUCT_DIR/../MSBuild/$vcnumwithdot/Bin/amd64"
+fi
 fi
 MSBUILD_PATH=`win_short_path_for_make "$regvalue"`
-   AC_MSG_RESULT([$regvalue])
+AC_MSG_RESULT([$regvalue])
 fi
 
 #

40 matches

Mail list logo