date:20181127

[Libreoffice-commits] core.git: basctl/source compilerplugins/clang cui/source editeng/source include/sfx2 include/svtools include/vcl sfx2/source svtools/source sw/source

2018-11-27 Thread Libreoffice Gerrit user

 basctl/source/basicide/bastype2.cxx|   25 -
 basctl/source/basicide/bastype3.cxx|5 
 basctl/source/inc/bastype2.hxx |4 
 compilerplugins/clang/unusedmethods.results|  204 +++--
 compilerplugins/clang/unusedmethods.unused-returns.results |   34 +-
 cui/source/customize/cfgutil.cxx   |   71 
 cui/source/inc/cfgutil.hxx |8 
 editeng/source/editeng/impedit.hxx |2 
 editeng/source/editeng/impedit2.cxx|   59 ---
 include/sfx2/tabdlg.hxx|   10 
 include/svtools/ivctrl.hxx |1 
 include/vcl/vclmedit.hxx   |1 
 sfx2/source/dialog/tabdlg.cxx  |   53 ---
 svtools/source/contnr/contentenumeration.cxx   |   34 --
 svtools/source/contnr/contentenumeration.hxx   |   20 -
 svtools/source/contnr/ivctrl.cxx   |7 
 sw/source/core/inc/UndoTable.hxx   |4 
 sw/source/core/inc/doctxm.hxx  |2 
 sw/source/core/undo/untbl.cxx  |   18 -
 sw/source/ui/dialog/swdlgfact.cxx  |   28 -
 sw/source/ui/dialog/swdlgfact.hxx  |   11 
 sw/source/uibase/inc/prcntfld.hxx  |2 
 22 files changed, 142 insertions(+), 461 deletions(-)

New commits:
commit 3abf4b91dad8fa549457e74185c000e06ba5f019
Author: Noel Grandin 
AuthorDate: Tue Nov 27 09:32:52 2018 +0200
Commit: Noel Grandin 
CommitDate: Wed Nov 28 08:27:56 2018 +0100

loplugin:unusedmethods

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

diff --git a/basctl/source/basicide/bastype2.cxx 
b/basctl/source/basicide/bastype2.cxx
index ee2caf7ad48a..e75d8674a748 100644
--- a/basctl/source/basicide/bastype2.cxx
+++ b/basctl/source/basicide/bastype2.cxx
@@ -620,31 +620,6 @@ bool TreeListBox::ExpandingHdl()
 return bOK;
 }
 
-bool TreeListBox::IsEntryProtected( SvTreeListEntry* pEntry )
-{
-bool bProtected = false;
-if ( pEntry && ( GetModel()->GetDepth( pEntry ) == 1 ) )
-{
-EntryDescriptor aDesc( GetEntryDescriptor( pEntry ) );
-const ScriptDocument& aDocument( aDesc.GetDocument() );
-OSL_ENSURE( aDocument.isAlive(), "TreeListBox::IsEntryProtected: no 
document, or document is dead!" );
-if ( aDocument.isAlive() )
-{
-const OUString& aOULibName( aDesc.GetLibName() );
-Reference< script::XLibraryContainer > xModLibContainer( 
aDocument.getLibraryContainer( E_SCRIPTS ) );
-if ( xModLibContainer.is() && xModLibContainer->hasByName( 
aOULibName ) )
-{
-Reference< script::XLibraryContainerPassword > xPasswd( 
xModLibContainer, UNO_QUERY );
-if ( xPasswd.is() && xPasswd->isLibraryPasswordProtected( 
aOULibName ) && !xPasswd->isLibraryPasswordVerified( aOULibName ) )
-{
-bProtected = true;
-}
-}
-}
-}
-return bProtected;
-}
-
 //Fills up treelist for macros and dialogs
 void TreeListBox::FillTreeListBox( SvTreeListEntry* pRootEntry, const 
Sequence< OUString >& rNames,
 const EntryType& eType, const OUString& aBmpMacro )
diff --git a/basctl/source/basicide/bastype3.cxx 
b/basctl/source/basicide/bastype3.cxx
index eeaf863d05cc..90bbcbe44e83 100644
--- a/basctl/source/basicide/bastype3.cxx
+++ b/basctl/source/basicide/bastype3.cxx
@@ -787,11 +787,6 @@ bool SbTreeListBox::IsValidEntry(weld::TreeIter& rEntry)
 return bIsValid;
 }
 
-SbModule* TreeListBox::FindModule( SvTreeListEntry* pEntry )
-{
-return dynamic_cast(FindVariable(pEntry));
-}
-
 SbModule* SbTreeListBox::FindModule(weld::TreeIter* pEntry)
 {
 return dynamic_cast(FindVariable(pEntry));
diff --git a/basctl/source/inc/bastype2.hxx b/basctl/source/inc/bastype2.hxx
index 7115e6f2f589..9f6e1c4753c4 100644
--- a/basctl/source/inc/bastype2.hxx
+++ b/basctl/source/inc/bastype2.hxx
@@ -218,12 +218,9 @@ public:
 voidScanAllEntries();
 voidUpdateEntries();
 
-boolIsEntryProtected( SvTreeListEntry* pEntry );
-
 voidSetMode( BrowseMode nM ) { nMode = nM; }
 BrowseMode  GetMode() const { return nMode; }
 
-SbModule*   FindModule( SvTreeListEntry* pEntry );
 SbxVariable*FindVariable( SvTreeListEntry* pEntry );
 SvTreeListEntry*FindRootEntry( const ScriptDocument& rDocument, 
LibraryLocation eLocation );
 SvTreeListEntry*FindEntry( SvTreeListEntry* pParent, const OUString& 
rText, EntryType eType );
@@ -318,7 +315

[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - icon-themes/colibre icon-themes/colibre_svg officecfg/registry

2018-11-27 Thread Libreoffice Gerrit user

 icon-themes/colibre/cmd/lc_displaymasterbackground.png   
|binary
 icon-themes/colibre/cmd/lc_displaymasterobjects.png  
|binary
 icon-themes/colibre/cmd/lc_renameslide.png   
|binary
 icon-themes/colibre/cmd/lc_savebackground.png
|binary
 icon-themes/colibre/cmd/lc_selectbackground.png  
|binary
 icon-themes/colibre/cmd/sc_displaymasterbackground.png   
|binary
 icon-themes/colibre/cmd/sc_displaymasterobjects.png  
|binary
 icon-themes/colibre/cmd/sc_renameslide.png   
|binary
 icon-themes/colibre/cmd/sc_savebackground.png
|binary
 icon-themes/colibre/cmd/sc_selectbackground.png  
|binary
 icon-themes/colibre_svg/cmd/lc_displaymasterbackground.svg   |
8 +
 icon-themes/colibre_svg/cmd/lc_displaymasterobjects.svg  |   
23 +
 icon-themes/colibre_svg/cmd/lc_renameslide.svg   |
8 +
 icon-themes/colibre_svg/cmd/lc_savebackground.svg|
9 +
 icon-themes/colibre_svg/cmd/lc_selectbackground.svg  |
6 +
 icon-themes/colibre_svg/cmd/sc_displaymasterbackground.svg   |
6 +
 icon-themes/colibre_svg/cmd/sc_displaymasterobjects.svg  |   
46 ++
 icon-themes/colibre_svg/cmd/sc_renameslide.svg   |
7 +
 icon-themes/colibre_svg/cmd/sc_savebackground.svg|   
40 
 icon-themes/colibre_svg/cmd/sc_selectbackground.svg  |
5 +
 officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu |
3 
 21 files changed, 161 insertions(+)

New commits:
commit 6a79872f71ca59037f2af307d83d42ab0383747e
Author: andreas kainz 
AuthorDate: Wed Nov 28 00:47:51 2018 +0100
Commit: andreas_kainz 
CommitDate: Wed Nov 28 08:02:36 2018 +0100

Colibre icons: add impress Slide tab icons

Change-Id: Ia3d035d827c0f1b510f9ff3be8652f5bac69cead
Reviewed-on: https://gerrit.libreoffice.org/64136
Tested-by: Jenkins
Reviewed-by: andreas_kainz 
(cherry picked from commit b15b1a2a90fa4c239ff8a6a33e73ff50ea422abf)
Reviewed-on: https://gerrit.libreoffice.org/64142

diff --git a/icon-themes/colibre/cmd/lc_displaymasterbackground.png 
b/icon-themes/colibre/cmd/lc_displaymasterbackground.png
new file mode 100644
index ..933a3ed28688
Binary files /dev/null and 
b/icon-themes/colibre/cmd/lc_displaymasterbackground.png differ
diff --git a/icon-themes/colibre/cmd/lc_displaymasterobjects.png 
b/icon-themes/colibre/cmd/lc_displaymasterobjects.png
new file mode 100644
index ..7866eb8fa006
Binary files /dev/null and 
b/icon-themes/colibre/cmd/lc_displaymasterobjects.png differ
diff --git a/icon-themes/colibre/cmd/lc_renameslide.png 
b/icon-themes/colibre/cmd/lc_renameslide.png
new file mode 100644
index ..bd0c188a920f
Binary files /dev/null and b/icon-themes/colibre/cmd/lc_renameslide.png differ
diff --git a/icon-themes/colibre/cmd/lc_savebackground.png 
b/icon-themes/colibre/cmd/lc_savebackground.png
new file mode 100644
index ..005e4e0fb04b
Binary files /dev/null and b/icon-themes/colibre/cmd/lc_savebackground.png 
differ
diff --git a/icon-themes/colibre/cmd/lc_selectbackground.png 
b/icon-themes/colibre/cmd/lc_selectbackground.png
new file mode 100644
index ..04867264e04d
Binary files /dev/null and b/icon-themes/colibre/cmd/lc_selectbackground.png 
differ
diff --git a/icon-themes/colibre/cmd/sc_displaymasterbackground.png 
b/icon-themes/colibre/cmd/sc_displaymasterbackground.png
new file mode 100644
index ..6a9d6b5f9f7a
Binary files /dev/null and 
b/icon-themes/colibre/cmd/sc_displaymasterbackground.png differ
diff --git a/icon-themes/colibre/cmd/sc_displaymasterobjects.png 
b/icon-themes/colibre/cmd/sc_displaymasterobjects.png
new file mode 100644
index ..e01cb12ceaeb
Binary files /dev/null and 
b/icon-themes/colibre/cmd/sc_displaymasterobjects.png differ
diff --git a/icon-themes/colibre/cmd/sc_renameslide.png 
b/icon-themes/colibre/cmd/sc_renameslide.png
new file mode 100644
index ..2acec9c80a90
Binary files /dev/null and b/icon-themes/colibre/cmd/sc_renameslide.png differ
diff --git a/icon-themes/colibre/cmd/sc_savebackground.png 
b/icon-themes/colibre/cmd/sc_savebackground.png
new file mode 100644
index ..ddf979d5f2b1
Binary files /dev/null and b/icon-themes/colibre/cmd/sc_savebackground.png 
differ
diff --git a/icon-themes/colibre/cmd/sc_selectbackground.png 
b/icon-themes/colibre/cmd/sc_selectbackground.png
new file mode 100644
index ..cafef6039dfd
Binary files /dev/null and b/icon-themes/colibre/cmd/sc_selectbackground.png 
differ
diff --git a/icon-themes/colibre_svg/cmd/lc_displaymasterbackground.svg 
b/icon-themes/colibre_svg/cmd/lc_di

[Libreoffice-commits] core.git: icon-themes/colibre icon-themes/colibre_svg officecfg/registry

2018-11-27 Thread Libreoffice Gerrit user

 icon-themes/colibre/cmd/lc_displaymasterbackground.png   
|binary
 icon-themes/colibre/cmd/lc_displaymasterobjects.png  
|binary
 icon-themes/colibre/cmd/lc_renameslide.png   
|binary
 icon-themes/colibre/cmd/lc_savebackground.png
|binary
 icon-themes/colibre/cmd/lc_selectbackground.png  
|binary
 icon-themes/colibre/cmd/sc_displaymasterbackground.png   
|binary
 icon-themes/colibre/cmd/sc_displaymasterobjects.png  
|binary
 icon-themes/colibre/cmd/sc_renameslide.png   
|binary
 icon-themes/colibre/cmd/sc_savebackground.png
|binary
 icon-themes/colibre/cmd/sc_selectbackground.png  
|binary
 icon-themes/colibre_svg/cmd/lc_displaymasterbackground.svg   |
8 +
 icon-themes/colibre_svg/cmd/lc_displaymasterobjects.svg  |   
23 +
 icon-themes/colibre_svg/cmd/lc_renameslide.svg   |
8 +
 icon-themes/colibre_svg/cmd/lc_savebackground.svg|
9 +
 icon-themes/colibre_svg/cmd/lc_selectbackground.svg  |
6 +
 icon-themes/colibre_svg/cmd/sc_displaymasterbackground.svg   |
6 +
 icon-themes/colibre_svg/cmd/sc_displaymasterobjects.svg  |   
46 ++
 icon-themes/colibre_svg/cmd/sc_renameslide.svg   |
7 +
 icon-themes/colibre_svg/cmd/sc_savebackground.svg|   
40 
 icon-themes/colibre_svg/cmd/sc_selectbackground.svg  |
5 +
 officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu |
3 
 21 files changed, 161 insertions(+)

New commits:
commit b15b1a2a90fa4c239ff8a6a33e73ff50ea422abf
Author: andreas kainz 
AuthorDate: Wed Nov 28 00:47:51 2018 +0100
Commit: andreas_kainz 
CommitDate: Wed Nov 28 06:53:58 2018 +0100

Colibre icons: add impress Slide tab icons

Change-Id: Ia3d035d827c0f1b510f9ff3be8652f5bac69cead
Reviewed-on: https://gerrit.libreoffice.org/64136
Tested-by: Jenkins
Reviewed-by: andreas_kainz 

diff --git a/icon-themes/colibre/cmd/lc_displaymasterbackground.png 
b/icon-themes/colibre/cmd/lc_displaymasterbackground.png
new file mode 100644
index ..933a3ed28688
Binary files /dev/null and 
b/icon-themes/colibre/cmd/lc_displaymasterbackground.png differ
diff --git a/icon-themes/colibre/cmd/lc_displaymasterobjects.png 
b/icon-themes/colibre/cmd/lc_displaymasterobjects.png
new file mode 100644
index ..7866eb8fa006
Binary files /dev/null and 
b/icon-themes/colibre/cmd/lc_displaymasterobjects.png differ
diff --git a/icon-themes/colibre/cmd/lc_renameslide.png 
b/icon-themes/colibre/cmd/lc_renameslide.png
new file mode 100644
index ..bd0c188a920f
Binary files /dev/null and b/icon-themes/colibre/cmd/lc_renameslide.png differ
diff --git a/icon-themes/colibre/cmd/lc_savebackground.png 
b/icon-themes/colibre/cmd/lc_savebackground.png
new file mode 100644
index ..005e4e0fb04b
Binary files /dev/null and b/icon-themes/colibre/cmd/lc_savebackground.png 
differ
diff --git a/icon-themes/colibre/cmd/lc_selectbackground.png 
b/icon-themes/colibre/cmd/lc_selectbackground.png
new file mode 100644
index ..04867264e04d
Binary files /dev/null and b/icon-themes/colibre/cmd/lc_selectbackground.png 
differ
diff --git a/icon-themes/colibre/cmd/sc_displaymasterbackground.png 
b/icon-themes/colibre/cmd/sc_displaymasterbackground.png
new file mode 100644
index ..6a9d6b5f9f7a
Binary files /dev/null and 
b/icon-themes/colibre/cmd/sc_displaymasterbackground.png differ
diff --git a/icon-themes/colibre/cmd/sc_displaymasterobjects.png 
b/icon-themes/colibre/cmd/sc_displaymasterobjects.png
new file mode 100644
index ..e01cb12ceaeb
Binary files /dev/null and 
b/icon-themes/colibre/cmd/sc_displaymasterobjects.png differ
diff --git a/icon-themes/colibre/cmd/sc_renameslide.png 
b/icon-themes/colibre/cmd/sc_renameslide.png
new file mode 100644
index ..2acec9c80a90
Binary files /dev/null and b/icon-themes/colibre/cmd/sc_renameslide.png differ
diff --git a/icon-themes/colibre/cmd/sc_savebackground.png 
b/icon-themes/colibre/cmd/sc_savebackground.png
new file mode 100644
index ..ddf979d5f2b1
Binary files /dev/null and b/icon-themes/colibre/cmd/sc_savebackground.png 
differ
diff --git a/icon-themes/colibre/cmd/sc_selectbackground.png 
b/icon-themes/colibre/cmd/sc_selectbackground.png
new file mode 100644
index ..cafef6039dfd
Binary files /dev/null and b/icon-themes/colibre/cmd/sc_selectbackground.png 
differ
diff --git a/icon-themes/colibre_svg/cmd/lc_displaymasterbackground.svg 
b/icon-themes/colibre_svg/cmd/lc_displaymasterbackground.svg
new file mode 100644
index ..920c2bdce075
--- /dev/null
+++ b/icon-themes/colibre_svg/cmd

[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - sd/uiconfig

2018-11-27 Thread Libreoffice Gerrit user

 sd/uiconfig/simpress/ui/notebookbar.ui |  754 +
 1 file changed, 495 insertions(+), 259 deletions(-)

New commits:
commit 5b665dd1b6b225bc47e412dea5fb5199c7d78d4f
Author: andreas kainz 
AuthorDate: Sun Nov 25 21:47:41 2018 +0100
Commit: andreas_kainz 
CommitDate: Wed Nov 28 06:53:41 2018 +0100

NB tabbed impress: add shortcuts and Right2Left support

Change-Id: Ic333dd44c980ace2f52057d795c29930515965f1
Reviewed-on: https://gerrit.libreoffice.org/64006
Tested-by: Jenkins
Reviewed-by: andreas_kainz 
(cherry picked from commit ab86777f93754f1f40d8a7ed584422ddc05b9eb7)
Reviewed-on: https://gerrit.libreoffice.org/64027

diff --git a/sd/uiconfig/simpress/ui/notebookbar.ui 
b/sd/uiconfig/simpress/ui/notebookbar.ui
index a9e6f7e171c7..97c23ade6fa9 100644
--- a/sd/uiconfig/simpress/ui/notebookbar.ui
+++ b/sd/uiconfig/simpress/ui/notebookbar.ui
@@ -1015,6 +1015,13 @@
   
 
 
+  
+True
+False
+.uno:VerticalText
+  
+
+
   
 True
 False
@@ -2157,7 +2164,7 @@
 
   
 True
-False
+True
 end
 True
 icons
@@ -2184,7 +2191,7 @@
 
   
 True
-False
+True
 end
 True
 icons
@@ -2227,9 +2234,10 @@
   
 _File
 True
-False
+True
 False
 False
+end
 center
 True
 immediate
@@ -2246,9 +2254,10 @@
   
 _Help
 True
-False
+True
 False
 False
+end
 center
 True
 immediate
@@ -2309,7 +2318,7 @@
 
   
 True
-False
+True
 center
 5
 True
@@ -2343,7 +2352,7 @@
 
   
 True
-False
+True
 both-horiz
 False
 
@@ -2368,7 +2377,7 @@
 
   
 True
-False
+True
 both-horiz
 False
 
@@ -2428,7 +2437,7 @@
 
   
 True
-False
+True
 center
 True
 both
@@ -2462,7 +2471,7 @@
 
   
 True
-False
+True
 False
 False
 .uno:RecentFileList
@@ -2478,7 +2487,7 @@
 
   
 True
-False
+True
 both-horiz
 False
 
@@ -2538,7 +2547,7 @@
 
   
 True
-False
+True
 center
 True
 both
@@ -2572,7 +2581,7 @@
 
   
 True
-False
+True
 both-horiz
 False
 
@@ -2597,7 +2606,7 @@

Приглашение на конференцию и конкурс

2018-11-27 Thread Открытие

Уважаемые коллеги!
Приглашаем Вас принять участие в наших
конференциях.

В
настоящее время открыт приём работ
на 2 конференции и 1
конкурс:

28-29 ноября

5-6 декабря

XIX Международная научная конференция
«Приоритеты мировой науки: эксперимент и научная дискуссия», г.
Северный Чарльстон, США (XIX International scientific conference
"The priorities of the world science: experiments and scientific
debate", North Charleston, SC, USA)

IV Международная научная конференция
"Современное общество: глобальные и региональные процессы", г.
Санкт-Петербург

- Информационное письмо-

http://otkritieinfo.ru/mezhdunarodnaya-nauchnaya-konferenc

- Информационное письмо-

http://otkritieinfo.ru/sovremennoe-obschestvo-vzglyad-izn

12-13 декабря

IV Ежегодная международная научно-практическая
конференция: Фундаментальная и прикладная наука: основные итоги
2017 г. - IV Annual International Scientific Conference:
fundamental and applied sciences: the main results of 2017. г.
Санкт-Петербург, Россия – North Charleston, SC, USA

- Информационное письмо-

http://otkritieinfo.ru/fundamentalnaya-i-prikladnaya-nauka-osnovnyye-itogi
-

Также
предлагаем вам опприубликовать результаты своих
исследований в
научном журнале «Актуальные вопросы современной
науки».

В издании
публикуются материалы по гуманитарным,
общественным,
техническим, естественнонаучным
дисциплинам.
В настоящее
время идёт приём работ в октябрьский номер
журнала - № 4(20).

Правила оформления работ в журнал и образец
заявки для журнала:

http://otkritieinfo.ru/nauchnyy-zhurnal-aktualnye-voprosy

Ответные
письма просим направлять по адресу otkritie1...@yandex.ru 
( 
http://service.nicotkritie.ru/track/redirect/cf5c547581fd1facb0bedea7a59fed6ae6d9b042256094c9
  )


С
уважением.
Научно-издательский центр "Открытие"

http://www.otkritieinfo.ru

Чтобы отписаться от рассылки,
нажмите здесь 
( 
http://service.nicotkritie.ru/track/redirect/cf5c547581fd1facb0bedea7a59fed6a857012cf94e88733
  )


Отписаться ( 
http://service.nicotkritie.ru/unsubscriptions/cf5c547581fd1fac5b8280acb2f765b2 )___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'private/thb/libo-6-1+backports' - 22 commits - chart2/inc chart2/source configure.ac drawinglayer/qa drawinglayer/source include/drawinglayer include/svx includ

2018-11-27 Thread Libreoffice Gerrit user

Rebased ref, commits from common ancestor:
commit 6c024b7c7ca511f670be72224a220e34230a3329
Author: Thorsten Behrens 
AuthorDate: Wed Nov 28 00:38:40 2018 +0100
Commit: Thorsten Behrens 
CommitDate: Wed Nov 28 00:43:07 2018 +0100

Disable the GL based 3D charts

KDE5 currently does not support GL windows properly, so lets disable
that - this is the gist of 026e2623f7f498432e6dc970fb06145dfc77dc45
but with minimal footprint for easier branch maintenance.

Change-Id: I88113596e460c6300a826f821d918a761632047e

diff --git a/chart2/inc/ChartModel.hxx b/chart2/inc/ChartModel.hxx
index 83dca2872772..44e873b02912 100644
--- a/chart2/inc/ChartModel.hxx
+++ b/chart2/inc/ChartModel.hxx
@@ -476,16 +476,9 @@ public:
 
 void removeDataProviders();
 
-#if HAVE_FEATURE_OPENGL
-OpenGLWindow* getOpenGLWindow() { return mpOpenGLWindow;}
-#endif
-
 private:
 sal_Int32 mnStart;
 sal_Int32 mnEnd;
-#if HAVE_FEATURE_OPENGL
-VclPtr mpOpenGLWindow;
-#endif
 };
 
 }  // namespace chart
diff --git a/chart2/source/controller/main/ChartWindow.cxx 
b/chart2/source/controller/main/ChartWindow.cxx
index a0f7c31de47d..a5080383d9c9 100644
--- a/chart2/source/controller/main/ChartWindow.cxx
+++ b/chart2/source/controller/main/ChartWindow.cxx
@@ -58,11 +58,7 @@ ChartWindow::ChartWindow( ChartController* pController, 
vcl::Window* pParent, Wi
 , m_pWindowController( pController )
 , m_bInPaint(false)
 , m_pViewShellWindow( nullptr )
-#if HAVE_FEATURE_OPENGL
-, m_pOpenGLWindow(VclPtr::Create(this, false))
-#else
 , m_pOpenGLWindow(nullptr)
-#endif
 {
 set_id("chart_window");
 SetHelpId( HID_SCH_WIN_DOCUMENT );
diff --git a/chart2/source/model/main/ChartModel.cxx 
b/chart2/source/model/main/ChartModel.cxx
index d0ceb73b88e7..c917f4d64a65 100644
--- a/chart2/source/model/main/ChartModel.cxx
+++ b/chart2/source/model/main/ChartModel.cxx
@@ -112,9 +112,6 @@ 
ChartModel::ChartModel(uno::Reference const & xContext)
 "com.sun.star.xml.NamespaceMap", 
"com.sun.star.comp.chart.XMLNameSpaceMap" ), uno::UNO_QUERY)
 , mnStart(0)
 , mnEnd(0)
-#if HAVE_FEATURE_OPENGL
-, mpOpenGLWindow(nullptr)
-#endif
 {
 osl_atomic_increment(&m_refCount);
 {
@@ -156,9 +153,6 @@ ChartModel::ChartModel( const ChartModel & rOther )
 , m_xInternalDataProvider( rOther.m_xInternalDataProvider )
 , mnStart(rOther.mnStart)
 , mnEnd(rOther.mnEnd)
-#if HAVE_FEATURE_OPENGL
-, mpOpenGLWindow(nullptr)
-#endif
 {
 osl_atomic_increment(&m_refCount);
 {
@@ -1309,12 +1303,7 @@ void ChartModel::setTimeBasedRange(sal_Int32 nStart, 
sal_Int32 nEnd)
 
 void ChartModel::setWindow( const sal_uInt64 nWindowPtr )
 {
-#if HAVE_FEATURE_OPENGL
-OpenGLWindow* pWindow = reinterpret_cast(nWindowPtr);
-mpOpenGLWindow = pWindow;
-#else
 (void)nWindowPtr;
-#endif
 }
 
 void ChartModel::update()
@@ -1325,9 +1314,6 @@ void ChartModel::update()
 }
 mxChartView->setViewDirty();
 mxChartView->update();
-#if HAVE_FEATURE_OPENGL
-mxChartView->updateOpenGLWindow();
-#endif
 }
 
 bool ChartModel::isDataFromSpreadsheet()
diff --git a/chart2/source/model/template/ChartTypeManager.cxx 
b/chart2/source/model/template/ChartTypeManager.cxx
index bb9656f76692..1b81327efd1b 100644
--- a/chart2/source/model/template/ChartTypeManager.cxx
+++ b/chart2/source/model/template/ChartTypeManager.cxx
@@ -32,9 +32,6 @@
 #include "NetChartTypeTemplate.hxx"
 #include "BubbleChartTypeTemplate.hxx"
 #include 
-#if HAVE_FEATURE_OPENGL
-#include "GL3DBarChartTypeTemplate.hxx"
-#endif
 #include 
 #include 
 #include 
@@ -529,16 +526,7 @@ uno::Reference< uno::XInterface > SAL_CALL 
ChartTypeManager::createInstance(
 case TEMPLATE_BUBBLE:
 xTemplate.set( new BubbleChartTypeTemplate( m_xContext, 
aServiceSpecifier ));
 break;
-#if HAVE_FEATURE_OPENGL
-case TEMPLATE_GL3DBAR:
-xTemplate.set(new GL3DBarChartTypeTemplate(m_xContext, 
aServiceSpecifier));
-break;
-case TEMPLATE_GL3DBAR_ROUNDED_RECTANGLE:
-xTemplate.set(new GL3DBarChartTypeTemplate(m_xContext, 
aServiceSpecifier));
-break;
-#else
 default: break;
-#endif
 //case TEMPLATE_SURFACE:
 //case TEMPLATE_ADDIN:
 //   break;
diff --git a/chart2/source/view/main/ChartView.cxx 
b/chart2/source/view/main/ChartView.cxx
index 22f268b19a4a..9b8e157afc28 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -50,9 +50,6 @@
 #include 
 #include 
 #include 
-#if HAVE_FEATURE_OPENGL
-#include 
-#endif
 #include 
 #include 
 #include 
@@ -70,9 +67,6 @@
 #include 
 #include 
 #include 
-#if HAVE_FEATURE_OPENGL
-#include 
-#endif
 #include 
 
 #include 
@@ -1066,35 +1060,19 @@ public:
 virtual void scroll(long nDelta) override;
 virtual void contextDestroyed() override;
 
-#if HAVE_FEATURE_O

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - accessibility/AllLangResTarget_acc.mk accessibility/Ant_java_uno_accessbridge.mk accessibility/bridge accessibility/inc accessibility/j

2018-11-27 Thread Libreoffice Gerrit user

 Module_ooo.mk  
 |1 
 Repository.mk  
 |2 
 accessibility/AllLangResTarget_acc.mk  
 |   34 --
 accessibility/Ant_java_uno_accessbridge.mk 
 |   29 ++
 accessibility/Library_acc.mk   
 |  142 ++
 accessibility/Library_java_uno_accessbridge.mk 
 |   61 
 accessibility/Makefile 
 |   32 ++
 accessibility/Module_accessibility.mk  
 |   39 ++
 accessibility/bridge/org/openoffice/java/accessibility/makefile.mk 
 |  111 ---
 accessibility/bridge/source/java/WindowsAccessBridgeAdapter.cxx
 |4 
 accessibility/bridge/source/java/exports.dxp   
 |4 
 accessibility/bridge/source/java/makefile.mk   
 |   66 
 accessibility/inc/accessibility/helper/acc_factory.hxx 
 |5 
 accessibility/inc/accessibility/helper/accessibilitydllapi.h   
 |   37 ++
 accessibility/inc/pch/precompiled_accessibility_accessbridge.cxx   
 |   25 +
 accessibility/inc/pch/precompiled_accessibility_accessbridge.hxx   
 |   33 ++
 accessibility/java/java_uno_accessbridge/build.xml 
 |   67 
 
accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/accessibility/java_uno_accessbridge.component
 |   28 +
 
accessibility/java/java_uno_accessbridge/src/main/java/org/openoffice/java/accessibility/AccessibleRelationAdapter.java.old
 |   20 -
 accessibility/prj/build.lst
 |   18 -
 accessibility/prj/d.lst
 |8 
 accessibility/prj/makefile.mk  
 |   41 +-
 accessibility/source/extended/makefile.mk  
 |   77 -
 accessibility/source/standard/makefile.mk  
 |   74 -
 accessibility/util/makefile.mk 
 |   82 -
 postprocess/packcomponents/makefile.mk 
 |2 
 26 files changed, 547 insertions(+), 495 deletions(-)

New commits:
commit 41624b9b261a22a0e6f1d9848cdb8456dd4dfb6c
Author: Damjan Jovanovic 
AuthorDate: Tue Nov 27 19:21:36 2018 +
Commit: Damjan Jovanovic 
CommitDate: Tue Nov 27 19:21:36 2018 +

Complete my previous patch.

Patch by: me

diff --git a/accessibility/prj/build.lst b/accessibility/prj/build.lst
index 5c823b6f9b6b..28b42bc52479 100644
--- a/accessibility/prj/build.lst
+++ b/accessibility/prj/build.lst
@@ -1,18 +1,2 @@
 ac  accessibility  :L10N:l10n tools jurt offapi unoil vcl 
javaunohelper jvmaccess cppu sal toolkit svtools LIBXSLT:libxslt NULL
-ac accessibility   usr1-   
all ac_mkout NULL
-ac accessibility\inc   nmake   -   
all ac_inc NULL
-ac accessibility\bridge\org\openoffice\java\accessibility  nmake   -   
w   ac_ooja ac_inc NULL
-ac accessibility\bridge\org\openoffice\accessibility   nmake   -   
w   ac_ooa ac_ooja.w ac_inc NULL
-ac accessibility\bridge\source\javanmake   -   
w   ac_ooan ac_ooa.w ac_inc NULL
-ac  accessibility\inc   get -   all 
ac_inc NULL
-ac  accessibility\source\helper nmake   -   all 
ac_helper ac_inc NULL
-ac  accessibility\source\standard

[Libreoffice-commits] help.git: Branch 'libreoffice-6-2' - source/text

2018-11-27 Thread Libreoffice Gerrit user

 source/text/scalc/01/04060110.xhp|9 ++
 source/text/scalc/01/func_webservice.xhp |  124 ---
 2 files changed, 75 insertions(+), 58 deletions(-)

New commits:
commit 49bd9d10394529a2992295735f020aecd81c14ae
Author: Olivier Hallot 
AuthorDate: Mon Nov 26 14:48:59 2018 -0200
Commit: Adolfo Jayme Barrientos 
CommitDate: Tue Nov 27 21:45:05 2018 +0100

tdf#120927 Webservice functions needs linking to

Change-Id: I8d96025238fc2005dab37c1050a0c7915210d73a
Reviewed-on: https://gerrit.libreoffice.org/64056
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/source/text/scalc/01/04060110.xhp 
b/source/text/scalc/01/04060110.xhp
index 6f50c9096..c582ffc30 100644
--- a/source/text/scalc/01/04060110.xhp
+++ b/source/text/scalc/01/04060110.xhp
@@ -777,6 +777,15 @@
 
  =VALUE("4321") returns 4321.
 
+
+
+
+
+
+
+
+
+
 
 
 
diff --git a/source/text/scalc/01/func_webservice.xhp 
b/source/text/scalc/01/func_webservice.xhp
index 0401cf023..e74e1613b 100644
--- a/source/text/scalc/01/func_webservice.xhp
+++ b/source/text/scalc/01/func_webservice.xhp
@@ -1,62 +1,70 @@
 
 
+* 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/.
+*
+-->
 
- 
- 
- URI Functions
- /text/scalc/01/func_webservice.xhp
- 
- 
- 
- 
- WEBSERVICE function
- 
- 
- WEBSERVICE
- Get some web content from a URI.
-
- WEBSERVICE(URI)
- URI:  URI text of the web service.
-
- =WEBSERVICE("wiki.documentfoundation.org/api.php?hidebots=1&days=7&limit=50&action=feedrecentchanges&feedformat=rss")
- Returns 
the web page content of 
"https://wiki.documentfoundation.org/api.php?hidebots=1&days=7&limit=50&action=feedrecentchanges&feedformat=rss";.
-   
-   
- 
- 
-   FILTERXML function
- 
- FILTERXML
- Apply a XPath expression to a XML 
document.
-
- FILTERXML(XML 
Document; XPath expression)
- XML 
Document (required): String containing a valid XML stream.
- XPath expression (required): String containing a 
valid XPath expression.
-
- =FILTERXML(WEBSERVICE("wiki.documentfoundation.org/api.php?hidebots=1&days=7&limit=50&action=feedrecentchanges&feedformat=rss");"//lastBuildDate")
-  Returns 
information on the last build date of the wiki.
-   
-   
-   
-   
-   ENCODEURL function
-   
-   ENCODEURL function
-   Returns a URL-encoded 
string.
-   Use this function to transform text with symbols of national 
alphabets (for example accented characters, non-ASCII alphabets or Asian words) 
to a string of URL-standard symbols.
-
-   ENCODEURL(Text)
-   Text: String to encode to a sequence of 
URL-standard symbols.
-
-   If cell A1 contains the Cyrillic text "автомобиль", =ENCODEURL(A1) returns 
%D0%B0%D0%B2%D1%82%D0%BE%D0%BC%D0%BE%D0%B1%D0%B8%D0%BB%D1%8C (the word 
"автомобиль" means car in Russian).
-   If cell B1 contains the text "車", =ENCODEURL(B1) returns %E8%BB%8A ("車" means car in 
Japanese).
-   
- 
+
+
+URI Functions
+/text/scalc/01/func_webservice.xhp
+
+
+
+
+
+WEBSERVICE function
+
+
+
+WEBSERVICE
+Get some web content from a 
URI.
+
+
+WEBSERVICE(URI)
+URI:  URI text of the web service.
+
+=WEBSERVICE("wiki.documentfoundation.org/api.php?hidebots=1&days=7&limit=50&action=feedrecentchanges&feedformat=rss")
+Returns the web page content of 
"https://wiki.documentfoundation.org/api.php?hidebots=1&days=7&limit=50&action=feedrecentchanges&feedformat=rss";.
+
+
+
+
+FILTERXML function
+
+
+FILTERXML
+Apply a XPath expression to a 
XML document.
+
+
+FILTERXML(XML Document; XPath expression)
+XML Document (required): String containing a 
valid XML stream.
+XPath expression (required): String containing a 
valid XPath expression.
+
+=FILTERXML(WEBSERVICE("wiki.documentfoundation.org/api.php?hidebots=1&days=7&limit=50&action=feedrecentchanges&feedformat=rss");"//lastBuildDate")
+ 
Returns information on the last build date of the wiki.
+
+
+
+
+ENCODEURL function
+
+
+ENCODEURL
+Returns a URL-encoded 
string.
+
+Use this function to transform text with symbols of national 
alphabets (for example accented characters, non-ASCII alphabets or Asian words) 
to a string of URL-

[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - helpcontent2

2018-11-27 Thread Libreoffice Gerrit user

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

New commits:
commit a281e0daffafee41c5ccd86c7a34a1eaa5906f76
Author: Olivier Hallot 
AuthorDate: Mon Nov 26 14:48:59 2018 -0200
Commit: Gerrit Code Review 
CommitDate: Tue Nov 27 21:45:05 2018 +0100

Update git submodules

* Update helpcontent2 from branch 'libreoffice-6-2'
  - tdf#120927 Webservice functions needs linking to

Change-Id: I8d96025238fc2005dab37c1050a0c7915210d73a
Reviewed-on: https://gerrit.libreoffice.org/64056
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/helpcontent2 b/helpcontent2
index 6e0523b7cdce..49bd9d103945 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 6e0523b7cdce9919412bf5209c64d1df5061651e
+Subproject commit 49bd9d10394529a2992295735f020aecd81c14ae
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2018-11-27 Thread Libreoffice Gerrit user

 vcl/inc/image.h|4 
 vcl/source/image/Image.cxx |   10 +++---
 vcl/source/image/ImplImage.cxx |   36 
 3 files changed, 39 insertions(+), 11 deletions(-)

New commits:
commit da3432a0a8ab06c5bbd79a82703bf07e79c692f9
Author: Michael Meeks 
AuthorDate: Mon Nov 26 14:00:08 2018 +
Commit: Michael Meeks 
CommitDate: Tue Nov 27 21:33:35 2018 +0100

Use HiDPI scaling to load scaled images.

We render these at apparently the same pixel size as normal images,
but the underlying canvas is larger so these then end up pixel-matching
the true underlying grid.

Change-Id: Ic4b749127e9c81da78d06b34d9f88c5635dc64b9
Reviewed-on: https://gerrit.libreoffice.org/64044
Tested-by: Jenkins
Reviewed-by: Michael Meeks 

diff --git a/vcl/inc/image.h b/vcl/inc/image.h
index f966a8c62c1f..c9fb5393191a 100644
--- a/vcl/inc/image.h
+++ b/vcl/inc/image.h
@@ -44,9 +44,13 @@ struct ImplImage
 
 /// get size in co-ordinates not scaled for HiDPI
 Size getSizePixel();
+/// Legacy - the original bitmap
 BitmapEx getBitmapEx(bool bDisabled = false);
+/// Taking account of HiDPI scaling
+BitmapEx getBitmapExForHiDPI(bool bDisabled = false);
 bool isEqual(const ImplImage &ref) const;
 bool isSizeEmpty() const { return maSizePixel == Size(0, 0); }
+bool loadStockAtScale(double fScale, BitmapEx &rBitmapEx);
 };
 
 #endif // INCLUDED_VCL_INC_IMAGE_H
diff --git a/vcl/source/image/Image.cxx b/vcl/source/image/Image.cxx
index 8bce4839a1ea..ecb514c5bbac 100644
--- a/vcl/source/image/Image.cxx
+++ b/vcl/source/image/Image.cxx
@@ -111,13 +111,9 @@ void Image::Draw(OutputDevice* pOutDev, const Point& rPos, 
DrawImageFlags nStyle
 if (!mpImplData || (!pOutDev->IsDeviceOutputNecessary() && 
pOutDev->GetConnectMetaFile() == nullptr))
 return;
 
-const Point aSrcPos(0, 0);
-Size aBitmapSizePixel = mpImplData->getSizePixel();
+Size aOutSize = pSize ? *pSize : 
pOutDev->PixelToLogic(mpImplData->getSizePixel());
 
-Size aOutSize = pSize ? *pSize : pOutDev->PixelToLogic(aBitmapSizePixel);
-
-// FIXME: do the HiDPI scaling fun here [!] =)
-BitmapEx aRenderBmp = mpImplData->getBitmapEx(!!(nStyle & 
DrawImageFlags::Disable));
+BitmapEx aRenderBmp = mpImplData->getBitmapExForHiDPI(!!(nStyle & 
DrawImageFlags::Disable));
 
 if (!(nStyle & DrawImageFlags::Disable) &&
 (nStyle & (DrawImageFlags::ColorTransform | DrawImageFlags::Highlight |
@@ -154,7 +150,7 @@ void Image::Draw(OutputDevice* pOutDev, const Point& rPos, 
DrawImageFlags nStyle
 aRenderBmp = aTempBitmapEx;
 }
 
-pOutDev->DrawBitmapEx(rPos, aOutSize, aSrcPos, aBitmapSizePixel, 
aRenderBmp);
+pOutDev->DrawBitmapEx(rPos, aOutSize, aRenderBmp);
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/image/ImplImage.cxx b/vcl/source/image/ImplImage.cxx
index 471dcb091e3d..95d605e47173 100644
--- a/vcl/source/image/ImplImage.cxx
+++ b/vcl/source/image/ImplImage.cxx
@@ -18,6 +18,7 @@
  */
 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -49,6 +50,21 @@ ImplImage::ImplImage(const OUString &aStockName)
 {
 }
 
+bool ImplImage::loadStockAtScale(double fScale, BitmapEx &rBitmapEx)
+{
+BitmapEx aBitmapEx;
+OUString aIconTheme = 
Application::GetSettings().GetStyleSettings().DetermineIconTheme();
+if (!ImageTree::get().loadImage(maStockName, aIconTheme, aBitmapEx, true,
+fScale * 100.0,
+ImageLoadFlags::IgnoreScalingFactor))
+{
+SAL_WARN("vcl", "Failed to load scaled image from " << maStockName << 
" at " << fScale);
+return false;
+}
+rBitmapEx = aBitmapEx;
+return true;
+}
+
 Size ImplImage::getSizePixel()
 {
 Size aRet;
@@ -56,13 +72,11 @@ Size ImplImage::getSizePixel()
 aRet = maSizePixel;
 else if (isStock())
 {
-BitmapEx aBitmapEx;
-if (vcl::ImageRepository::loadImage(maStockName, aBitmapEx))
+if (loadStockAtScale(1.0, maBitmapEx))
 {
 assert(!maDisabledBitmapEx);
 assert(maBitmapChecksum == 0);
-maBitmapEx = aBitmapEx;
-maSizePixel = aBitmapEx.GetSizePixel();
+maSizePixel = maBitmapEx.GetSizePixel();
 aRet = maSizePixel;
 }
 else
@@ -102,4 +116,18 @@ bool ImplImage::isEqual(const ImplImage &ref) const
 return maBitmapEx == ref.maBitmapEx;
 }
 
+BitmapEx ImplImage::getBitmapExForHiDPI(bool bDisabled)
+{
+if (isStock())
+{   // check we have the right bitmap cached.
+// FIXME: DPI scaling should be tied to the outdev really ...
+double fScale = comphelper::LibreOfficeKit::getDPIScale();
+Size aTarget(maSizePixel.Width()*fScale,
+ maSizePixel.Height()*fScale);
+if (maBitmapEx.GetSizePixel() != aTarget)
+loadStockAtScale(fSc

[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - sw/source

2018-11-27 Thread Libreoffice Gerrit user

 sw/source/core/doc/docftn.cxx |   71 ++
 1 file changed, 51 insertions(+), 20 deletions(-)

New commits:
commit 912c1584cbdb5eaedb079755df1150b95e8f7329
Author: Bjoern Michaelsen 
AuthorDate: Sat Nov 10 20:22:50 2018 +0100
Commit: Xisco Faulí 
CommitDate: Tue Nov 27 21:14:02 2018 +0100

tdf#120115: Dont crash on Footnote/Table undo/redo

brown paperbag commit:

- for one, we only want to use the anchor format when we dont have
  another one, not the other way around
- also we want to update the anchor format (not the char format) when it
  tells us so.
- finally, keep the selected Char and AnchorFormat in Sync between
  SwEndnoteInfo and the underlying DocumentStylePoolManager

Change-Id: Ic599dc1290c4e30d1746e5eefe6fed27b0ccdfe9
Reviewed-on: https://gerrit.libreoffice.org/63306
Tested-by: Jenkins
Tested-by: Xisco Faulí 
Reviewed-by: Xisco Faulí 

diff --git a/sw/source/core/doc/docftn.cxx b/sw/source/core/doc/docftn.cxx
index ffbb49c35623..8f8f43d3a500 100644
--- a/sw/source/core/doc/docftn.cxx
+++ b/sw/source/core/doc/docftn.cxx
@@ -138,39 +138,69 @@ void SwEndNoteInfo::SetFootnoteTextColl(SwTextFormatColl& 
rFormat)
 aDepends.StartListening(pTextFormatColl);
 }
 
-SwCharFormat* SwEndNoteInfo::GetCharFormat(SwDoc &rDoc) const
+SwCharFormat* SwEndNoteInfo::GetCharFormat(SwDoc& rDoc) const
 {
-if (!pCharFormat)
+auto pCharFormatFromDoc = 
rDoc.getIDocumentStylePoolAccess().GetCharFormatFromPool( 
static_cast(
+m_bEndNote ? RES_POOLCHR_ENDNOTE : RES_POOLCHR_FOOTNOTE ) );
+if (pCharFormat != pCharFormatFromDoc)
 {
-pCharFormat = 
rDoc.getIDocumentStylePoolAccess().GetCharFormatFromPool( 
static_cast(
-m_bEndNote ? RES_POOLCHR_ENDNOTE : RES_POOLCHR_FOOTNOTE ) );
-aDepends.StartListening(pCharFormat);
+aDepends.EndListening(pCharFormat);
+aDepends.StartListening(pCharFormatFromDoc);
+pCharFormat = pCharFormatFromDoc;
 }
 return pCharFormat;
 }
 
-void SwEndNoteInfo::SetCharFormat( SwCharFormat* pChFormat )
+namespace
 {
-aDepends.EndListening(pCharFormat);
-pCharFormat = pChFormat;
-aDepends.StartListening(pCharFormat);
+void lcl_ResetPoolIdForDocAndSync(const sal_uInt16 nId, SwCharFormat* 
pFormat, SwEndNoteInfo& rInfo)
+{
+auto pDoc = pFormat->GetDoc();
+if(!pDoc)
+return;
+for(auto pDocFormat : *pDoc->GetCharFormats())
+{
+if(pDocFormat == pFormat)
+pDocFormat->SetPoolFormatId(nId);
+else if(pDocFormat->GetPoolFormatId() == nId)
+pDocFormat->SetPoolFormatId(0);
+}
+rInfo.GetCharFormat(*pDoc);
+rInfo.GetAnchorCharFormat(*pDoc);
+}
+}
+
+void SwEndNoteInfo::SetCharFormat(SwCharFormat* pFormat)
+{
+lcl_ResetPoolIdForDocAndSync(
+static_cast(m_bEndNote
+? RES_POOLCHR_ENDNOTE
+: RES_POOLCHR_FOOTNOTE),
+pFormat,
+*this);
 }
 
 SwCharFormat* SwEndNoteInfo::GetAnchorCharFormat(SwDoc& rDoc) const
 {
-if(!pAnchorFormat)
+auto pAnchorFormatFromDoc = 
rDoc.getIDocumentStylePoolAccess().GetCharFormatFromPool( 
static_cast(
+m_bEndNote ? RES_POOLCHR_ENDNOTE_ANCHOR : RES_POOLCHR_FOOTNOTE_ANCHOR 
) );
+if(pAnchorFormat != pAnchorFormatFromDoc)
 {
-pAnchorFormat = 
rDoc.getIDocumentStylePoolAccess().GetCharFormatFromPool( 
static_cast(
-m_bEndNote ? RES_POOLCHR_ENDNOTE_ANCHOR : 
RES_POOLCHR_FOOTNOTE_ANCHOR ) );
-aDepends.StartListening(pAnchorFormat);
+aDepends.EndListening(pAnchorFormat);
+aDepends.StartListening(pAnchorFormatFromDoc);
+pAnchorFormat = pAnchorFormatFromDoc;
 }
 return pAnchorFormat;
 }
 
 void SwEndNoteInfo::SetAnchorCharFormat(SwCharFormat* pFormat)
 {
-pAnchorFormat = pFormat;
-aDepends.StartListening(pAnchorFormat);
+lcl_ResetPoolIdForDocAndSync(
+static_cast(m_bEndNote
+? RES_POOLCHR_ENDNOTE_ANCHOR
+: RES_POOLCHR_FOOTNOTE_ANCHOR),
+pFormat,
+*this);
 }
 
 SwCharFormat* SwEndNoteInfo::GetCurrentCharFormat(const bool bAnchor) const
@@ -187,7 +217,7 @@ void SwEndNoteInfo::SwClientNotify( const SwModify& 
rModify, const SfxHint& rHin
 const sal_uInt16 nWhich = pLegacyHint->m_pOld ? 
pLegacyHint->m_pOld->Which() : pLegacyHint->m_pNew ? 
pLegacyHint->m_pNew->Which() : 0 ;
 if (RES_ATTRSET_CHG == nWhich || RES_FMT_CHG == nWhich)
 {
-auto pFormat = GetCurrentCharFormat(pCharFormat != nullptr);
+auto pFormat = GetCurrentCharFormat(pCharFormat == nullptr);
 if (!pFormat || !aDepends.IsListeningTo(pFormat) || 
pFormat->IsFormatInDTOR())
 return;
 SwDoc* pDoc = pFormat->GetDoc();
@@ -207,14 +237,15 @@ void SwEndNoteInfo::SwClientNotify( c

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

2018-11-27 Thread Libreoffice Gerrit user

 chart2/source/controller/dialogs/dlg_DataSource.cxx  |  138 ++
 chart2/source/controller/dialogs/tp_DataSource.cxx   |   30 +
 chart2/source/controller/dialogs/tp_DataSource.hxx   |4 
 chart2/source/controller/dialogs/tp_RangeChooser.cxx |   24 -
 chart2/source/controller/dialogs/tp_RangeChooser.hxx |4 
 chart2/source/controller/inc/dlg_DataSource.hxx  |   25 -
 chart2/source/controller/main/ChartController.cxx|4 
 chart2/uiconfig/ui/datarangedialog.ui|  113 +
 chart2/uiconfig/ui/tp_DataSource.ui  |  386 +--
 chart2/uiconfig/ui/tp_RangeChooser.ui|   82 +---
 vcl/source/app/salvtables.cxx|1 
 vcl/unx/gtk3/gtk3gtkinst.cxx |1 
 12 files changed, 463 insertions(+), 349 deletions(-)

New commits:
commit 0f25a3c36f27fd51453b9a9115f236b83c143684
Author: Caolán McNamara 
AuthorDate: Mon Nov 26 20:30:25 2018 +
Commit: Caolán McNamara 
CommitDate: Tue Nov 27 21:10:52 2018 +0100

weld DataSourceDialog

Change-Id: I4d3eb8aa354043d3ff57b4996db7b28ad25e0262
Reviewed-on: https://gerrit.libreoffice.org/64072
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/chart2/source/controller/dialogs/dlg_DataSource.cxx 
b/chart2/source/controller/dialogs/dlg_DataSource.cxx
index 76b03043b1dd..86651bcfd6bd 100644
--- a/chart2/source/controller/dialogs/dlg_DataSource.cxx
+++ b/chart2/source/controller/dialogs/dlg_DataSource.cxx
@@ -76,41 +76,6 @@ Reference< chart2::XChartTypeTemplate > 
DocumentChartTypeTemplateProvider::getCu
 return m_xTemplate;
 }
 
-class DataSourceTabControl : public TabControl
-{
-public:
-explicit DataSourceTabControl(vcl::Window* pParent);
-
-virtual bool DeactivatePage() override;
-
-void DisableTabToggling();
-void EnableTabToggling();
-
-private:
-bool m_bTogglingEnabled;
-};
-
-DataSourceTabControl::DataSourceTabControl(vcl::Window* pParent)
-: TabControl(pParent)
-, m_bTogglingEnabled(true)
-{
-}
-
-bool DataSourceTabControl::DeactivatePage()
-{
-return TabControl::DeactivatePage() && m_bTogglingEnabled;
-}
-
-void DataSourceTabControl::DisableTabToggling()
-{
-m_bTogglingEnabled = false;
-}
-
-void DataSourceTabControl::EnableTabToggling()
-{
-m_bTogglingEnabled = true;
-}
-
 sal_uInt16 DataSourceDialog::m_nLastPageId = 0;
 
 enum DataSourceDialogPages
@@ -119,56 +84,47 @@ enum DataSourceDialogPages
 TP_DATA_SOURCE = 2
 };
 
-DataSourceDialog::DataSourceDialog(vcl::Window * pParent,
+DataSourceDialog::DataSourceDialog(weld::Window * pParent,
 const Reference< XChartDocument > & xChartDocument,
 const Reference< uno::XComponentContext > & xContext)
-: TabDialog(pParent, "DataRangeDialog",
-"modules/schart/ui/datarangedialog.ui")
+: GenericDialogController(pParent, "modules/schart/ui/datarangedialog.ui",
+  "DataRangeDialog")
 , m_apDocTemplateProvider(new 
DocumentChartTypeTemplateProvider(xChartDocument))
 , m_apDialogModel(new DialogModel(xChartDocument, xContext))
-, m_pTabControl(VclPtr::Create(get_content_area()))
 , m_pRangeChooserTabPage(nullptr)
 , m_pDataSourceTabPage(nullptr)
 , m_bRangeChooserTabIsValid(true)
 , m_bDataSourceTabIsValid(true)
-{
-get(m_pBtnOK, "ok");
-
-m_pTabControl->Show();
-
-m_pRangeChooserTabPage = 
VclPtr::Create(TabPageParent(m_pTabControl), 
*(m_apDialogModel.get()),
- m_apDocTemplateProvider.get(), this, true 
/* bHideDescription */ );
-m_pDataSourceTabPage = 
VclPtr::Create(TabPageParent(m_pTabControl), 
*(m_apDialogModel.get()),
-m_apDocTemplateProvider.get(), this, true 
/* bHideDescription */ );
-
-m_pTabControl->InsertPage( TP_RANGECHOOSER, SchResId(STR_PAGE_DATA_RANGE) 
);
-m_pTabControl->InsertPage( TP_DATA_SOURCE,  
SchResId(STR_OBJECT_DATASERIES_PLURAL) );
-
-m_pTabControl->SetTabPage( TP_DATA_SOURCE,  m_pDataSourceTabPage );
-m_pTabControl->SetTabPage( TP_RANGECHOOSER, m_pRangeChooserTabPage );
-
-m_pTabControl->SelectTabPage( m_nLastPageId );
+, m_bTogglingEnabled(true)
+, m_xTabControl(m_xBuilder->weld_notebook("notebook"))
+, m_xBtnOK(m_xBuilder->weld_button("ok"))
+{
+TabPageParent aRangeParent(m_xTabControl->get_page("range"), this);
+m_pRangeChooserTabPage = VclPtr::Create(aRangeParent, 
*(m_apDialogModel.get()),
+ m_apDocTemplateProvider.get(), nullptr, 
true /* bHideDescription */ );
+TabPageParent aSeriesParent(m_xTabControl->get_page("series"), this);
+m_pDataSourceTabPage = VclPtr::Create(aSeriesParent, 
*(m_apDialogModel.get()),
+m_apDocTemplateProvider.get(), nullptr, 
true /* bHideDescription */ );
+m_xTabControl->connect_enter_page(LINK(this, DataSourceDialog, 
ActivatePageHdl));
+m

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

2018-11-27 Thread Libreoffice Gerrit user

 vcl/unx/gtk3/gtk3gtkinst.cxx |  148 ++-
 1 file changed, 134 insertions(+), 14 deletions(-)

New commits:
commit 471d6c3653b8b8006db022c5d94af7503adfdc56
Author: Caolán McNamara 
AuthorDate: Tue Nov 27 10:18:52 2018 +
Commit: Caolán McNamara 
CommitDate: Tue Nov 27 21:10:02 2018 +0100

enable hiding gtk dialogs without ending their dialog loop

we need this to support reshowing dialog after an intermediate
range selection dialog executes

Change-Id: Ib6575e5d852bd1d29cc1a791a5dc2c19949b67a0
Reviewed-on: https://gerrit.libreoffice.org/64100
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index e207e7793b68..0165998bb0ea 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -2277,10 +2277,117 @@ namespace
 }
 }
 
+struct DialogRunner
+{
+GtkDialog *m_pDialog;
+gint m_nResponseId;
+GMainLoop *m_pLoop;
+VclPtr m_xFrameWindow;
+
+DialogRunner(GtkDialog* pDialog)
+   : m_pDialog(pDialog)
+   , m_nResponseId(GTK_RESPONSE_NONE)
+   , m_pLoop(nullptr)
+{
+GtkWindow* pParent = 
gtk_window_get_transient_for(GTK_WINDOW(m_pDialog));
+GtkSalFrame* pFrame = GtkSalFrame::getFromWindow(pParent);
+m_xFrameWindow = pFrame ? pFrame->GetWindow() : nullptr;
+}
+
+bool loop_is_running() const
+{
+return m_pLoop && g_main_loop_is_running(m_pLoop);
+}
+
+void loop_quit()
+{
+if (g_main_loop_is_running(m_pLoop))
+g_main_loop_quit(m_pLoop);
+}
+
+static void signal_response(GtkDialog*, gint nResponseId, gpointer data)
+{
+DialogRunner* pThis = static_cast(data);
+pThis->m_nResponseId = nResponseId;
+pThis->loop_quit();
+}
+
+static gboolean signal_delete(GtkDialog*, GdkEventAny*, gpointer data)
+{
+DialogRunner* pThis = static_cast(data);
+pThis->loop_quit();
+return true; /* Do not destroy */
+}
+
+static void signal_destroy(GtkDialog*, gpointer data)
+{
+DialogRunner* pThis = static_cast(data);
+pThis->loop_quit();
+}
+
+void inc_modal_count()
+{
+if (m_xFrameWindow)
+m_xFrameWindow->IncModalCount();
+}
+
+void dec_modal_count()
+{
+if (m_xFrameWindow)
+m_xFrameWindow->DecModalCount();
+}
+
+// same as gtk_dialog_run except that unmap doesn't auto-respond
+// so we can hide the dialog and restore it without a response getting
+// triggered
+gint run()
+{
+g_object_ref(m_pDialog);
+
+inc_modal_count();
+
+bool bWasModal = gtk_window_get_modal(GTK_WINDOW(m_pDialog));
+if (!bWasModal)
+gtk_window_set_modal(GTK_WINDOW(m_pDialog), true);
+
+if (!gtk_widget_get_visible(GTK_WIDGET(m_pDialog)))
+gtk_widget_show(GTK_WIDGET(m_pDialog));
+
+gulong nSignalResponseId = g_signal_connect(m_pDialog, "response", 
G_CALLBACK(signal_response), this);
+gulong nSignalDeleteId = g_signal_connect(m_pDialog, "delete-event", 
G_CALLBACK(signal_delete), this);
+gulong nSignalDestroyId = g_signal_connect(m_pDialog, "destroy", 
G_CALLBACK(signal_destroy), this);
+
+m_pLoop = g_main_loop_new(nullptr, false);
+m_nResponseId = GTK_RESPONSE_NONE;
+
+gdk_threads_leave();
+g_main_loop_run(m_pLoop);
+gdk_threads_enter();
+
+g_main_loop_unref(m_pLoop);
+
+m_pLoop = nullptr;
+
+if (!bWasModal)
+gtk_window_set_modal(GTK_WINDOW(m_pDialog), false);
+
+g_signal_handler_disconnect(m_pDialog, nSignalResponseId);
+g_signal_handler_disconnect(m_pDialog, nSignalDeleteId);
+g_signal_handler_disconnect(m_pDialog, nSignalDestroyId);
+
+dec_modal_count();
+
+g_object_unref(m_pDialog);
+
+return m_nResponseId;
+}
+};
+
 class GtkInstanceDialog : public GtkInstanceWindow, public virtual weld::Dialog
 {
 private:
 GtkDialog* m_pDialog;
+DialogRunner m_aDialogRun;
 std::shared_ptr m_xDialogController;
 std::function m_aFunc;
 gulong m_nCloseSignalId;
@@ -2330,10 +2437,12 @@ private:
 m_aFunc = nullptr;
 m_xDialogController.reset();
 }
+
 public:
 GtkInstanceDialog(GtkDialog* pDialog, bool bTakeOwnership)
 : GtkInstanceWindow(GTK_WINDOW(pDialog), bTakeOwnership)
 , m_pDialog(pDialog)
+, m_aDialogRun(pDialog)
 , m_nCloseSignalId(g_signal_connect(m_pDialog, "close", 
G_CALLBACK(signalClose), this))
 , m_nResponseSignalId(0)
 {
@@ -2359,16 +2468,9 @@ public:
 {
 
sort_native_button_order(GTK_BOX(gtk_dialog_get_action_area(m_pDialog)));
 int ret;
-GtkWindow* pParent = 
gtk_window_get_transient_for(GTK_WINDOW(m_pDialog));
-GtkSalFrame* pFra

[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - vcl/unx

2018-11-27 Thread Libreoffice Gerrit user

 vcl/unx/gtk3/gtk3gtkinst.cxx |  148 ++-
 1 file changed, 134 insertions(+), 14 deletions(-)

New commits:
commit 98b4920fdc57e6590e5e7bb29ab102f8e155fe87
Author: Caolán McNamara 
AuthorDate: Tue Nov 27 10:18:52 2018 +
Commit: Caolán McNamara 
CommitDate: Tue Nov 27 21:09:38 2018 +0100

enable hiding gtk dialogs without ending their dialog loop

we need this to support reshowing dialog after an intermediate
range selection dialog executes

Change-Id: Ib6575e5d852bd1d29cc1a791a5dc2c19949b67a0
Reviewed-on: https://gerrit.libreoffice.org/64101
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index e207e7793b68..0165998bb0ea 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -2277,10 +2277,117 @@ namespace
 }
 }
 
+struct DialogRunner
+{
+GtkDialog *m_pDialog;
+gint m_nResponseId;
+GMainLoop *m_pLoop;
+VclPtr m_xFrameWindow;
+
+DialogRunner(GtkDialog* pDialog)
+   : m_pDialog(pDialog)
+   , m_nResponseId(GTK_RESPONSE_NONE)
+   , m_pLoop(nullptr)
+{
+GtkWindow* pParent = 
gtk_window_get_transient_for(GTK_WINDOW(m_pDialog));
+GtkSalFrame* pFrame = GtkSalFrame::getFromWindow(pParent);
+m_xFrameWindow = pFrame ? pFrame->GetWindow() : nullptr;
+}
+
+bool loop_is_running() const
+{
+return m_pLoop && g_main_loop_is_running(m_pLoop);
+}
+
+void loop_quit()
+{
+if (g_main_loop_is_running(m_pLoop))
+g_main_loop_quit(m_pLoop);
+}
+
+static void signal_response(GtkDialog*, gint nResponseId, gpointer data)
+{
+DialogRunner* pThis = static_cast(data);
+pThis->m_nResponseId = nResponseId;
+pThis->loop_quit();
+}
+
+static gboolean signal_delete(GtkDialog*, GdkEventAny*, gpointer data)
+{
+DialogRunner* pThis = static_cast(data);
+pThis->loop_quit();
+return true; /* Do not destroy */
+}
+
+static void signal_destroy(GtkDialog*, gpointer data)
+{
+DialogRunner* pThis = static_cast(data);
+pThis->loop_quit();
+}
+
+void inc_modal_count()
+{
+if (m_xFrameWindow)
+m_xFrameWindow->IncModalCount();
+}
+
+void dec_modal_count()
+{
+if (m_xFrameWindow)
+m_xFrameWindow->DecModalCount();
+}
+
+// same as gtk_dialog_run except that unmap doesn't auto-respond
+// so we can hide the dialog and restore it without a response getting
+// triggered
+gint run()
+{
+g_object_ref(m_pDialog);
+
+inc_modal_count();
+
+bool bWasModal = gtk_window_get_modal(GTK_WINDOW(m_pDialog));
+if (!bWasModal)
+gtk_window_set_modal(GTK_WINDOW(m_pDialog), true);
+
+if (!gtk_widget_get_visible(GTK_WIDGET(m_pDialog)))
+gtk_widget_show(GTK_WIDGET(m_pDialog));
+
+gulong nSignalResponseId = g_signal_connect(m_pDialog, "response", 
G_CALLBACK(signal_response), this);
+gulong nSignalDeleteId = g_signal_connect(m_pDialog, "delete-event", 
G_CALLBACK(signal_delete), this);
+gulong nSignalDestroyId = g_signal_connect(m_pDialog, "destroy", 
G_CALLBACK(signal_destroy), this);
+
+m_pLoop = g_main_loop_new(nullptr, false);
+m_nResponseId = GTK_RESPONSE_NONE;
+
+gdk_threads_leave();
+g_main_loop_run(m_pLoop);
+gdk_threads_enter();
+
+g_main_loop_unref(m_pLoop);
+
+m_pLoop = nullptr;
+
+if (!bWasModal)
+gtk_window_set_modal(GTK_WINDOW(m_pDialog), false);
+
+g_signal_handler_disconnect(m_pDialog, nSignalResponseId);
+g_signal_handler_disconnect(m_pDialog, nSignalDeleteId);
+g_signal_handler_disconnect(m_pDialog, nSignalDestroyId);
+
+dec_modal_count();
+
+g_object_unref(m_pDialog);
+
+return m_nResponseId;
+}
+};
+
 class GtkInstanceDialog : public GtkInstanceWindow, public virtual weld::Dialog
 {
 private:
 GtkDialog* m_pDialog;
+DialogRunner m_aDialogRun;
 std::shared_ptr m_xDialogController;
 std::function m_aFunc;
 gulong m_nCloseSignalId;
@@ -2330,10 +2437,12 @@ private:
 m_aFunc = nullptr;
 m_xDialogController.reset();
 }
+
 public:
 GtkInstanceDialog(GtkDialog* pDialog, bool bTakeOwnership)
 : GtkInstanceWindow(GTK_WINDOW(pDialog), bTakeOwnership)
 , m_pDialog(pDialog)
+, m_aDialogRun(pDialog)
 , m_nCloseSignalId(g_signal_connect(m_pDialog, "close", 
G_CALLBACK(signalClose), this))
 , m_nResponseSignalId(0)
 {
@@ -2359,16 +2468,9 @@ public:
 {
 
sort_native_button_order(GTK_BOX(gtk_dialog_get_action_area(m_pDialog)));
 int ret;
-GtkWindow* pParent = 
gtk_window_get_transient_for(GTK_WINDOW(m_pDialog));
-GtkSalFrame* pFra

[Libreoffice-commits] core.git: reportbuilder/java

2018-11-27 Thread Libreoffice Gerrit user

 reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java |   30 
+-
 1 file changed, 29 insertions(+), 1 deletion(-)

New commits:
commit 92c34111dd8095b97a3761ab10c3ac4a3c191310
Author: Caolán McNamara 
AuthorDate: Tue Nov 27 15:13:33 2018 +
Commit: Caolán McNamara 
CommitDate: Tue Nov 27 21:09:13 2018 +0100

Related: tdf#94446 set parent for dialog

Change-Id: I174ec605f40e7cafbcb44e492941dfc36a4df3f2
Reviewed-on: https://gerrit.libreoffice.org/64120
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git 
a/reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java 
b/reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java
index 26eb4950e248..463addc63e71 100644
--- a/reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java
+++ b/reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java
@@ -17,17 +17,24 @@
  */
 package org.libreoffice.report;
 
+import com.sun.star.awt.XWindow;
+import com.sun.star.beans.NamedValue;
 import com.sun.star.beans.PropertyVetoException;
 import com.sun.star.beans.UnknownPropertyException;
 import com.sun.star.beans.XPropertySet;
 import com.sun.star.container.NoSuchElementException;
+import com.sun.star.container.XChild;
 import com.sun.star.container.XIndexAccess;
 import com.sun.star.container.XNameAccess;
+import com.sun.star.frame.XController;
+import com.sun.star.frame.XFrame;
+import com.sun.star.frame.XModel;
 import com.sun.star.lang.IllegalArgumentException;
 import com.sun.star.lang.IndexOutOfBoundsException;
 import com.sun.star.lang.WrappedTargetException;
 import com.sun.star.sdb.CommandType;
 import com.sun.star.sdb.XCompletedExecution;
+import com.sun.star.sdb.XDocumentDataSource;
 import com.sun.star.sdb.XParametersSupplier;
 import com.sun.star.sdb.XQueriesSupplier;
 import com.sun.star.sdb.XSingleSelectQueryComposer;
@@ -159,6 +166,26 @@ public class SDBCReportDataFactory implements 
DataSourceFactory
 m_cmpCtx = cmpCtx;
 }
 
+public XWindow getParentWindow()
+{
+final XChild child = UnoRuntime.queryInterface(XChild.class, 
connection);
+if (child == null)
+return null;
+final XDocumentDataSource docSource = 
UnoRuntime.queryInterface(XDocumentDataSource.class, child.getParent());
+if (docSource == null)
+return null;
+final XModel model = UnoRuntime.queryInterface(XModel.class, 
docSource.getDatabaseDocument());
+if (model == null)
+return null;
+final XController controller = model.getCurrentController();
+if (controller == null)
+return null;
+final XFrame frame = controller.getFrame();
+if (frame == null)
+return null;
+return frame.getContainerWindow();
+}
+
 public DataSource queryData(final String command, final Map 
parameters) throws DataSourceException
 {
 try
@@ -201,7 +228,8 @@ public class SDBCReportDataFactory implements 
DataSourceFactory
 final XCompletedExecution execute = 
UnoRuntime.queryInterface(XCompletedExecution.class, rowSet);
 if (rowSetCreated && execute != null && 
paramDef.parameterCount > 0)
 {
-final XInteractionHandler handler = 
UnoRuntime.queryInterface(XInteractionHandler.class, 
m_cmpCtx.getServiceManager().createInstanceWithContext("com.sun.star.sdb.InteractionHandler",
 m_cmpCtx));
+final XWindow window = getParentWindow();
+final XInteractionHandler handler = 
UnoRuntime.queryInterface(XInteractionHandler.class, 
m_cmpCtx.getServiceManager().createInstanceWithArgumentsAndContext("com.sun.star.sdb.InteractionHandler",
 new Object[] { new NamedValue("Parent", window) }, m_cmpCtx));
 execute.executeWithCompletion(handler);
 }
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - include/vcl

2018-11-27 Thread Libreoffice Gerrit user

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

New commits:
commit 6e8605ee6de4ead23925476f0e945b51dea26be0
Author: Caolán McNamara 
AuthorDate: Tue Nov 27 14:57:08 2018 +
Commit: Caolán McNamara 
CommitDate: Tue Nov 27 21:08:49 2018 +0100

Related: tdf#94446 don't assert on unsetting focus handlers

Change-Id: I7817f66974807eaf7d16a6d0dc30b4fbd6d366a5
Reviewed-on: https://gerrit.libreoffice.org/64119
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx
index fa2ba7bcd03a..da5650395579 100644
--- a/include/vcl/weld.hxx
+++ b/include/vcl/weld.hxx
@@ -98,13 +98,13 @@ public:
 
 virtual void connect_focus_in(const Link& rLink)
 {
-assert(!m_aFocusInHdl.IsSet());
+assert(!m_aFocusInHdl.IsSet() || !rLink.IsSet());
 m_aFocusInHdl = rLink;
 }
 
 virtual void connect_focus_out(const Link& rLink)
 {
-assert(!m_aFocusOutHdl.IsSet());
+assert(!m_aFocusOutHdl.IsSet() || !rLink.IsSet());
 m_aFocusOutHdl = rLink;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2018-11-27 Thread Libreoffice Gerrit user

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

New commits:
commit e61dec64f86413f3c7d1d32e1675287eb3550f1f
Author: Caolán McNamara 
AuthorDate: Tue Nov 27 14:57:08 2018 +
Commit: Caolán McNamara 
CommitDate: Tue Nov 27 21:08:38 2018 +0100

Related: tdf#94446 don't assert on unsetting focus handlers

Change-Id: I7817f66974807eaf7d16a6d0dc30b4fbd6d366a5
Reviewed-on: https://gerrit.libreoffice.org/64118
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx
index fa2ba7bcd03a..da5650395579 100644
--- a/include/vcl/weld.hxx
+++ b/include/vcl/weld.hxx
@@ -98,13 +98,13 @@ public:
 
 virtual void connect_focus_in(const Link& rLink)
 {
-assert(!m_aFocusInHdl.IsSet());
+assert(!m_aFocusInHdl.IsSet() || !rLink.IsSet());
 m_aFocusInHdl = rLink;
 }
 
 virtual void connect_focus_out(const Link& rLink)
 {
-assert(!m_aFocusOutHdl.IsSet());
+assert(!m_aFocusOutHdl.IsSet() || !rLink.IsSet());
 m_aFocusOutHdl = rLink;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2018-11-27 Thread Libreoffice Gerrit user

 configure.ac |   11 +--
 1 file changed, 1 insertion(+), 10 deletions(-)

New commits:
commit 978a8357b25f2f319d3783cc6a58a6be79facac3
Author: Stephan Bergmann 
AuthorDate: Tue Nov 27 16:40:56 2018 +0100
Commit: Stephan Bergmann 
CommitDate: Tue Nov 27 20:43:06 2018 +0100

Remove --enable-c++17 option

...reverting 0f3b0ec973f06a98c75ef8acfa720a9973e4d2b5 "Avoid C++17 mode for
Coverity Scan".  As far as I understand,


"New Defects reported by Coverity Scan for LibreOffice" has been run against
dd0e6849297c18aabe4fc29c0340a2ed1e474eaf "Temporarily drop --disable-c++17 
from
Coverity builds" but doesn't let issues like the one discussed at


"Re: New Defects reported by Coverity Scan for LibreOffice" reappear.  So
disabling C++17 for Coverity Scan builds appears to no longer be necessary.

Change-Id: I22bfd9ad61da00e942a87aa5e1e0d1fab0004d49
Reviewed-on: https://gerrit.libreoffice.org/64121
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 
Tested-by: Jenkins

diff --git a/configure.ac b/configure.ac
index b35ceab44ad1..13d4afa1240d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6179,12 +6179,6 @@ dnl 
===
 dnl C++11
 dnl ===
 
-my_cxx17switches=
-libo_FUZZ_ARG_ENABLE(c++17,
-AS_HELP_STRING([--disable-c++17],
-[Do not attempt to run GCC/Clang in C++17 mode (needed for Coverity).])
-)
-
 AC_MSG_CHECKING([whether $CXX supports C++17, C++14, or C++11])
 CXXFLAGS_CXX11=
 if test "$COM" = MSC -a "$COM_IS_CLANG" != TRUE; then
@@ -6193,10 +6187,7 @@ elif test "$GCC" = "yes" -o "$COM_IS_CLANG" = TRUE; then
 dnl But only use C++17 if the gperf that is being used knows not to emit
 dnl "register" in C++ output:
 printf 'foo\n' | $GPERF -L C++ > conftest.inc
-my_flags='-std=gnu++14 -std=gnu++1y -std=c++14 -std=c++1y -std=gnu++11 
-std=gnu++0x -std=c++11 -std=c++0x'
-if test "$enable_c__17" != no; then
-my_flags="-std=gnu++2a -std=c++2a -std=gnu++17 -std=gnu++1z -std=c++17 
-std=c++1z $my_flags"
-fi
+my_flags='-std=gnu++2a -std=c++2a -std=gnu++17 -std=gnu++1z -std=c++17 
-std=c++1z -std=gnu++14 -std=gnu++1y -std=c++14 -std=c++1y -std=gnu++11 
-std=gnu++0x -std=c++11 -std=c++0x'
 for flag in $my_flags; do
 if test "$COM" = MSC; then
 flag="-Xclang $flag"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - sd/uiconfig

2018-11-27 Thread Libreoffice Gerrit user

 sd/uiconfig/sdraw/ui/notebookbar.ui |  260 
 1 file changed, 206 insertions(+), 54 deletions(-)

New commits:
commit 6ab7bfbca4148416233dbf8b9bfc79f3a1dfa821
Author: andreas kainz 
AuthorDate: Sun Nov 25 21:43:00 2018 +0100
Commit: andreas_kainz 
CommitDate: Tue Nov 27 19:05:53 2018 +0100

NB tabbed draw: add shortcuts and Right2Left support

Change-Id: I4531a32f38ecfc1cd26b092d84ec9da442a71ea9
Reviewed-on: https://gerrit.libreoffice.org/64005
Tested-by: Jenkins
Reviewed-by: andreas_kainz 
(cherry picked from commit 79def472f6cc8338cafd7bef88fdc9b0485f4ca7)
Reviewed-on: https://gerrit.libreoffice.org/64026

diff --git a/sd/uiconfig/sdraw/ui/notebookbar.ui 
b/sd/uiconfig/sdraw/ui/notebookbar.ui
index 33dd28c5d95e..4f315a0e39b6 100644
--- a/sd/uiconfig/sdraw/ui/notebookbar.ui
+++ b/sd/uiconfig/sdraw/ui/notebookbar.ui
@@ -1015,6 +1015,13 @@
   
 
 
+  
+True
+False
+.uno:VerticalText
+  
+
+
   
 True
 False
@@ -2078,6 +2085,7 @@
 True
 False
 False
+end
 center
 True
 immediate
@@ -2097,6 +2105,7 @@
 True
 False
 False
+end
 center
 True
 immediate
@@ -2863,7 +2872,7 @@
   
 True
 False
-File
+~File
 True
   
   
@@ -3027,6 +3036,7 @@
 True
 False
 False
+end
 center
 True
 none
@@ -3124,6 +3134,17 @@
 True
   
 
+
+  
+True
+False
+.uno:VerticalText
+  
+  
+False
+True
+  
+
   
   
 False
@@ -3597,7 +3618,7 @@
   
 200
 True
-True
+False
 both-horiz
 False
 
@@ -4002,7 +4023,7 @@
 
   
 True
-True
+False
 both-horiz
 False
 
@@ -4026,7 +4047,7 @@
 
   
 True
-True
+False
 icons
 False
 
@@ -4108,7 +4129,7 @@
   
 True
 False
-Home
+~Home
 True
 
   
@@ -4841,6 +4862,7 @@
 True
 False
 False
+end
 center
 True
 none
@@ -4909,7 +4931,7 @@
   
   
@@ -4939,11 +4961,12 @@
 vertical

[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - sc/uiconfig

2018-11-27 Thread Libreoffice Gerrit user

 sc/uiconfig/scalc/ui/notebookbar.ui |  391 +++-
 1 file changed, 252 insertions(+), 139 deletions(-)

New commits:
commit d47f95086da7728162efef48fce774940f3de89b
Author: andreas kainz 
AuthorDate: Sun Nov 25 20:40:39 2018 +0100
Commit: andreas_kainz 
CommitDate: Tue Nov 27 19:05:34 2018 +0100

NB tabbed calc: add shortcuts and Right2Left support

Change-Id: I96d760063bf1684cf893e7765f10b0695b2e16ed
Reviewed-on: https://gerrit.libreoffice.org/64004
Tested-by: Jenkins
Reviewed-by: andreas_kainz 
(cherry picked from commit 45b47d0e1eb44d5f6d83709ae31a8c4e89066afd)
Reviewed-on: https://gerrit.libreoffice.org/64025

diff --git a/sc/uiconfig/scalc/ui/notebookbar.ui 
b/sc/uiconfig/scalc/ui/notebookbar.ui
index a70bd3443f71..fad1a3d262a0 100644
--- a/sc/uiconfig/scalc/ui/notebookbar.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar.ui
@@ -1039,6 +1039,13 @@
   
 
 
+  
+True
+False
+.uno:VerticalText
+  
+
+
   
 True
 False
@@ -2738,7 +2745,7 @@
   
 True
 False
-File
+~File
 True
   
   
@@ -3137,7 +3144,7 @@
 
   
 True
-True
+False
 end
 5
 True
@@ -4378,6 +4385,7 @@
 True
 False
 False
+end
 center
 True
 none
@@ -4481,7 +4489,7 @@
   
 True
 False
-Home
+~Home
 True
 
   
@@ -4533,6 +4541,22 @@
 True
   
 
+  
+  
+False
+True
+0
+  
+
+
+