Shubham Goyal - license statement

[shubham goyal via LibreOffice]

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

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

[Libreoffice-commits] online.git: android/app

[Libreoffice Gerrit user]

 android/app/src/main/cpp/androidapp.cpp|   45 
+++---
 android/app/src/main/java/org/libreoffice/androidapp/MainActivity.java |   13 
++
 2 files changed, 43 insertions(+), 15 deletions(-)

New commits:
commit 8cd64c8cd8a3be44dbcef76b013299459b103a45
Author: Jan Holesovsky 
AuthorDate: Sat Feb 16 01:51:54 2019 +0100
Commit: Jan Holesovsky 
CommitDate: Sat Feb 16 01:51:54 2019 +0100

android: Make sending to JavaScript work.

I haven't tested yet if the message actually gets to the JS, but
definitely the callFakeWebsocketOnMessage() is called and the WebView
does not complain that it is called from another thread.

Change-Id: I0e32d5a7d8937d754ac9dc6aa4ef763b56b44a52

diff --git a/android/app/src/main/cpp/androidapp.cpp 
b/android/app/src/main/cpp/androidapp.cpp
index ab6f1586e..a1d393e07 100644
--- a/android/app/src/main/cpp/androidapp.cpp
+++ b/android/app/src/main/cpp/androidapp.cpp
@@ -30,8 +30,21 @@ static std::string fileURL;
 static LOOLWSD *loolwsd = nullptr;
 static int fakeClientFd;
 static int closeNotificationPipeForForwardingThread[2];
+static JavaVM* javaVM = nullptr;
 
-static void send2JS(JNIEnv *env, jobject obj, const std::vector& buffer)
+extern "C" JNIEXPORT jint JNICALL
+JNI_OnLoad(JavaVM* vm, void*) {
+javaVM = vm;
+
+JNIEnv* env;
+if (vm->GetEnv((void**)&env, JNI_VERSION_1_6) != JNI_OK) {
+return JNI_ERR; // JNI version not supported.
+}
+
+return JNI_VERSION_1_6;
+}
+
+static void send2JS(jclass mainActivityClz, jobject mainActivityObj, const 
std::vector& buffer)
 {
 LOG_TRC_NOFILE("Send to JS: " << 
LOOLProtocol::getAbbreviatedMessage(buffer.data(), buffer.size()));
 
@@ -87,17 +100,25 @@ static void send2JS(JNIEnv *env, jobject obj, const 
std::vector& buffer)
 
 LOG_TRC_NOFILE( "Sending to JavaScript: " << subjs);
 
-/* TODO commented out, see the other TODO wrt. the NewGlobalRef
+JNIEnv *env;
+jint res = javaVM->GetEnv((void**)&env, JNI_VERSION_1_6);
+if (res != JNI_OK) {
+LOG_TRC_NOFILE("GetEnv need to attach thread");
+res = javaVM->AttachCurrentThread(&env, nullptr);
+if (JNI_OK != res) {
+LOG_TRC_NOFILE("Failed to AttachCurrentThread");
+return;
+}
+}
+
 jstring jstr = env->NewStringUTF(js.c_str());
-jclass clazz = env->FindClass("org/libreoffice/androidapp/MainActivity");
-jmethodID callFakeWebsocket = env->GetMethodID(clazz, 
"callFakeWebsocketOnMessage", "(V)Ljava/lang/String;");
-env->CallObjectMethod(obj, callFakeWebsocket, jstr);
-*/
+jmethodID callFakeWebsocket = env->GetMethodID(mainActivityClz, 
"callFakeWebsocketOnMessage", "(Ljava/lang/String;)V");
+env->CallVoidMethod(mainActivityObj, callFakeWebsocket, jstr);
 }
 
 /// Handle a message from JavaScript.
 extern "C" JNIEXPORT void JNICALL
-Java_org_libreoffice_androidapp_MainActivity_postMobileMessage(JNIEnv *env, 
jobject obj, jstring message)
+Java_org_libreoffice_androidapp_MainActivity_postMobileMessage(JNIEnv *env, 
jobject instance, jstring message)
 {
 const char *string_value = env->GetStringUTFChars(message, nullptr);
 
@@ -119,9 +140,11 @@ 
Java_org_libreoffice_androidapp_MainActivity_postMobileMessage(JNIEnv *env, jobj
 fakeSocketPipe2(closeNotificationPipeForForwardingThread);
 
 // Start another thread to read responses and forward them to the 
JavaScript
-// TODO here we actually need to do NewGlobalRef and pass that to
-// the thread; not the env and obj itself
-std::thread([&env, &obj]
+jclass clz = env->GetObjectClass(instance);
+jclass mainActivityClz = (jclass) env->NewGlobalRef(clz);
+jobject mainActivityObj = env->NewGlobalRef(instance);
+
+std::thread([&mainActivityClz, &mainActivityObj]
 {
 Util::setThreadName("app2js");
 while (true)
@@ -156,7 +179,7 @@ 
Java_org_libreoffice_androidapp_MainActivity_postMobileMessage(JNIEnv *env, jobj
return;
std::vector buf(n);
n = fakeSocketRead(fakeClientFd, 
buf.data(), n);
-   send2JS(env, obj, buf);
+   send2JS(mainActivityClz, 
mainActivityObj, buf);
}
}
else
diff --git 
a/android/app/src/main/java/org/libreoffice/androidapp/MainActivity.java 
b/android/app/src/main/java/org/libreoffice/androidapp/MainActivity.java
index 173513e5c..a2027d611 100644
--- a/android/app/src/main/java/org/libreoffice/androidapp/MainActivity.java
+++ b/android/app/src/main/java/org/libreoffice/androidapp/MainActivity.java
@@ -124,7 +124,7 @@ public class MainActivity extends AppCompatAc

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - desktop/source officecfg/registry

[Libreoffice Gerrit user]

 desktop/source/migration/wizard.src|3 
++-
 officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu |6 
++
 2 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit ed04784ebca3aadda1c438c22b567e93d2c91da1
Author: Matthias Seidel 
AuthorDate: Fri Feb 15 21:38:52 2019 +
Commit: Matthias Seidel 
CommitDate: Fri Feb 15 21:38:52 2019 +

Sometimes the frame toolbar is missing from Writer when selecting a frame.

This should fix it.

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu
index 0c2a00be3502..e7ed23a96050 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu
@@ -304,6 +304,12 @@
 
 
 
+
+0,1
+
+
+0
+
 
 Frame
 
commit cd54f70ec9c5ab371cd26efb75545f97cd817119
Author: Matthias Seidel 
AuthorDate: Fri Feb 15 21:10:02 2019 +
Commit: Matthias Seidel 
CommitDate: Fri Feb 15 21:10:02 2019 +

This is no longer a registration wizard, so changing the wording.

diff --git a/desktop/source/migration/wizard.src 
b/desktop/source/migration/wizard.src
index f6be7c0055fb..4317906a2b00 100644
--- a/desktop/source/migration/wizard.src
+++ b/desktop/source/migration/wizard.src
@@ -82,7 +82,7 @@ String STR_WELCOME_MIGRATION
 
 String STR_WELCOME_WITHOUT_LICENSE
 {
-Text [ en-US ] = "This wizard will guide you through the registration of 
%PRODUCTNAME.\n\nClick 'Next' to continue.";
+Text [ en-US ] = "This wizard will guide you through the setup of 
%PRODUCTNAME.\n\nClick 'Next' to continue.";
 };
 
 String STR_FINISH
@@ -436,3 +436,4 @@ TabPage TP_REGISTRATION
 };
 };
 
+// ** EOF
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Benchmark results on mdds R-tree

[Kohei Yoshida]

Hi there,

I've written a summary of my benchmark test results on R-tree I've implemented 
in mdds.  I'm quite happy with the numbers.

http://kohei.us/2019/02/15/performance-benchmark-on-mdds-rtree/

Kohei

--
Kohei Yoshida, LibreOffice Calc volunteer hacker
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Libreoffice Gerrit user]

 sfx2/source/dialog/navigat.cxx |1 -
 sfx2/source/sidebar/SidebarChildWindow.cxx |2 +-
 sw/source/uibase/utlui/navipi.cxx  |3 +++
 3 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 5a557821c647c1a499270a8a1188e23fc015f782
Author: Jim Raykowski 
AuthorDate: Fri Feb 15 08:07:49 2019 +0100
Commit: Jim Raykowski 
CommitDate: Fri Feb 15 23:14:19 2019 +0100

Revert "tdf#49684 Don't focus on Navigator or Sidebar on show"

See tdf#122900 for unwanted behavior changed caused by this.

This reverts commit 88cbc3ea2db8358bbedff01361f95f972f2b0231.

Change-Id: I9451a4b1f059b40d33b66b06f23228fc64170d8d
Reviewed-on: https://gerrit.libreoffice.org/67853
Tested-by: Jenkins
Reviewed-by: Jim Raykowski 

diff --git a/sfx2/source/dialog/navigat.cxx b/sfx2/source/dialog/navigat.cxx
index e8cb333181e0..7ce24a62e073 100644
--- a/sfx2/source/dialog/navigat.cxx
+++ b/sfx2/source/dialog/navigat.cxx
@@ -43,7 +43,6 @@ SfxNavigatorWrapper::SfxNavigatorWrapper( vcl::Window* 
pParentWnd ,
 
 static_cast( GetWindow() )->Initialize( pInfo );
 SetHideNotDelete( true );
-Show( ShowFlags::NoFocusChange );
 }
 
 SfxNavigator::SfxNavigator( SfxBindings* pBind ,
diff --git a/sfx2/source/sidebar/SidebarChildWindow.cxx 
b/sfx2/source/sidebar/SidebarChildWindow.cxx
index 9c96f17ccf5b..7153c1d461b1 100644
--- a/sfx2/source/sidebar/SidebarChildWindow.cxx
+++ b/sfx2/source/sidebar/SidebarChildWindow.cxx
@@ -60,7 +60,7 @@ SidebarChildWindow::SidebarChildWindow (vcl::Window* 
pParentWindow, sal_uInt16 n
 }
 SetHideNotDelete(true);
 
-GetWindow()->Show(true, ShowFlags::NoFocusChange);
+GetWindow()->Show();
 }
 
 sal_Int32 SidebarChildWindow::GetDefaultWidth (vcl::Window const * pWindow)
diff --git a/sw/source/uibase/utlui/navipi.cxx 
b/sw/source/uibase/utlui/navipi.cxx
index 01fdf5c6372a..8ea7f633b5f8 100644
--- a/sw/source/uibase/utlui/navipi.cxx
+++ b/sw/source/uibase/utlui/navipi.cxx
@@ -739,7 +739,10 @@ SwNavigationPI::SwNavigationPI(SfxBindings* _pBindings,
 pActView->GetWrtShellPtr()->IsGlblDocSaveLinks());
 if (m_pConfig->IsGlobalActive())
 ToggleTree();
+m_aGlobalTree->GrabFocus();
 }
+else
+m_aContentTree->GrabFocus();
 UsePage();
 m_aPageChgIdle.SetInvokeHandler(LINK(this, SwNavigationPI, ChangePageHdl));
 m_aPageChgIdle.SetPriority(TaskPriority::LOWEST);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 vcl/source/window/paint.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 8c28bc32de753b403760bf79cb0415988ab0d89f
Author: Jan Holesovsky 
AuthorDate: Sun Feb 10 11:57:58 2019 +0100
Commit: Jan Holesovsky 
CommitDate: Fri Feb 15 22:53:28 2019 +0100

lok: Fix the font previews in eg. Format -> Character... dialog.

Change-Id: I5d25249c58f55c501e3e5610419753a68423b0f2
Reviewed-on: https://gerrit.libreoffice.org/67613
Tested-by: Jenkins
Reviewed-by: Jan Holesovsky 

diff --git a/vcl/source/window/paint.cxx b/vcl/source/window/paint.cxx
index ea8216bc7313..bcbb294e92e4 100644
--- a/vcl/source/window/paint.cxx
+++ b/vcl/source/window/paint.cxx
@@ -1386,9 +1386,11 @@ void Window::ImplPaintToDevice( OutputDevice* 
i_pTargetOutDev, const Point& i_rP
 if (!IsPaintTransparent() && IsBackground() && ! (GetParentClipMode() 
& ParentClipMode::NoClip))
 Erase(*pDevice);
 
+pDevice->SetMapMode(GetMapMode());
+
 Paint(*pDevice, tools::Rectangle(Point(), GetOutputSizePixel()));
 
-i_pTargetOutDev->DrawOutDev(i_rPos, aSize, Point(), aSize, *pDevice);
+i_pTargetOutDev->DrawOutDev(i_rPos, aSize, Point(), 
pDevice->PixelToLogic(aSize), *pDevice);
 
 // get rid of virtual device now so they don't pile up during 
recursive calls
 pDevice.disposeAndClear();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 include/vcl/salbtype.hxx |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit bc99e56a3173f99298a590232bfa9e9ff0125f61
Author: Tomaž Vajngerl 
AuthorDate: Thu Feb 14 22:09:00 2019 +0100
Commit: Tomaž Vajngerl 
CommitDate: Fri Feb 15 19:43:40 2019 +0100

BitmapColor string representation - fix proper padding

Change-Id: I42727152e71b2dce4c2b5ce71f9a54464388a7fb

diff --git a/include/vcl/salbtype.hxx b/include/vcl/salbtype.hxx
index ec953d209030..8a0f8bb6e424 100644
--- a/include/vcl/salbtype.hxx
+++ b/include/vcl/salbtype.hxx
@@ -133,7 +133,10 @@ public:
 template
 inline std::basic_ostream& operator 
<<(std::basic_ostream& rStream, const BitmapColor& rColor)
 {
-return rStream << "#(" << std::hex << std::setfill ('0') << std::setw(2) 
<< static_cast(rColor.GetRed()) << static_cast(rColor.GetGreen()) << 
static_cast(rColor.GetBlueOrIndex()) << 
static_cast(rColor.GetAlpha()) << ")";
+return rStream << "#(" << std::hex << std::setfill ('0') << std::setw(2) 
<< static_cast(rColor.GetRed())
+   << std::setw(2) << 
static_cast(rColor.GetGreen())
+   << std::setw(2) << 
static_cast(rColor.GetBlueOrIndex())
+   << std::setw(2) << 
static_cast(rColor.GetAlpha()) << ")";
 }
 
 class VCL_DLLPUBLIC BitmapPalette
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 dev/null   |binary
 extras/source/templates/presnt/Alizarin/styles.xml |   12 ++--
 extras/source/templates/presnt/Classy_Red/styles.xml   |4 ++--
 extras/source/templates/presnt/Midnightblue/styles.xml |4 ++--
 extras/source/templates/presnt/Vivid/styles.xml|4 ++--
 5 files changed, 12 insertions(+), 12 deletions(-)

New commits:
commit 802e77dd4fe0192942a493b4c83e2c8b31c210c2
Author: Laurent BP 
AuthorDate: Wed Feb 13 20:48:00 2019 +0100
Commit: Adolfo Jayme Barrientos 
CommitDate: Fri Feb 15 22:38:10 2019 +0100

tdf#113020 Change horizontal-align to justify

Some frames in templates were horizontal-align to left,
which prevent from centering text

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

diff --git a/extras/source/templates/presnt/Alizarin/styles.xml 
b/extras/source/templates/presnt/Alizarin/styles.xml
index 1aa0fd1949c5..f84aeb7ff168 100644
--- a/extras/source/templates/presnt/Alizarin/styles.xml
+++ b/extras/source/templates/presnt/Alizarin/styles.xml
@@ -233,7 +233,7 @@
   
 
 
-  
+  
 
   
 
@@ -283,7 +283,7 @@
   
 
 
-  
+  
 
   
 
@@ -429,7 +429,7 @@
   
 
 
-  
+  
 
   
 
@@ -479,7 +479,7 @@
   
 
 
-  
+  
 
   
 
@@ -578,7 +578,7 @@
   
 
 
-  
+  
 
 
   
@@ -593,7 +593,7 @@
   
 
 
-  
+  
 
 
   
diff --git a/extras/source/templates/presnt/Classy_Red/Classy_Red.otp 
b/extras/source/templates/presnt/Classy_Red/Classy_Red.otp
deleted file mode 100644
index 833e9199ab23..
Binary files a/extras/source/templates/presnt/Classy_Red/Classy_Red.otp and 
/dev/null differ
diff --git a/extras/source/templates/presnt/Classy_Red/styles.xml 
b/extras/source/templates/presnt/Classy_Red/styles.xml
index 334815731b76..f7cb26680803 100644
--- a/extras/source/templates/presnt/Classy_Red/styles.xml
+++ b/extras/source/templates/presnt/Classy_Red/styles.xml
@@ -120,7 +120,7 @@
   
 
 
-  
+  
   
   
 
@@ -235,7 +235,7 @@
   
 
 
-  
+  
 
   
 
diff --git a/extras/source/templates/presnt/Midnightblue/styles.xml 
b/extras/source/templates/presnt/Midnightblue/styles.xml
index 7f2508bdf6f6..7cd35b7f64a0 100644
--- a/extras/source/templates/presnt/Midnightblue/styles.xml
+++ b/extras/source/templates/presnt/Midnightblue/styles.xml
@@ -279,7 +279,7 @@
   
 
 
-  
+  
 
   
 
@@ -323,7 +323,7 @@
   
 
   
-  
+  
 
   
   
diff --git a/extras/source/templates/presnt/Vivid/styles.xml 
b/extras/source/templates/presnt/Vivid/styles.xml
index 67d917115924..b6819ebf2ce5 100644
--- a/extras/source/templates/presnt/Vivid/styles.xml
+++ b/extras/source/templates/presnt/Vivid/styles.xml
@@ -229,7 +229,7 @@
   
 
 
-  
+  
 
   
 
@@ -470,7 +470,7 @@
   
 
 
-  
+  
 
   
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 vcl/qt5/Qt5Widget.cxx |9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)

New commits:
commit 5ad289b558c11fcef3dada51b873b5f48b9a2cab
Author: Michael Weghorn 
AuthorDate: Fri Feb 15 20:41:07 2019 +0100
Commit: Michael Weghorn 
CommitDate: Fri Feb 15 22:07:53 2019 +0100

tdf#123451 qt5: Detect decimal separator on keypad

'QtKeyEvent::key()' doesn't return a special value for the
decimal separator key on the keypad ("," or "."), but just returns
'Qt::Key_Comma' or 'Qt::Key_Period'. However, the 'Qt::KeypadModifier'
modifier is set in this case, so check for this one in addition
and return 'KEY_DECIMAL' if those are combined.

Change-Id: Ia80826e2ad5e47a1f49bef450168523d766c1d6a
Reviewed-on: https://gerrit.libreoffice.org/67886
Tested-by: Jenkins
Reviewed-by: Michael Weghorn 

diff --git a/vcl/qt5/Qt5Widget.cxx b/vcl/qt5/Qt5Widget.cxx
index 22779464ee37..2baf7a37125a 100644
--- a/vcl/qt5/Qt5Widget.cxx
+++ b/vcl/qt5/Qt5Widget.cxx
@@ -238,7 +238,7 @@ void Qt5Widget::closeEvent(QCloseEvent* /*pEvent*/)
 m_pFrame->CallCallback(SalEvent::Close, nullptr);
 }
 
-static sal_uInt16 GetKeyCode(int keyval)
+static sal_uInt16 GetKeyCode(int keyval, Qt::KeyboardModifiers modifiers)
 {
 sal_uInt16 nCode = 0;
 if (keyval >= Qt::Key_0 && keyval <= Qt::Key_9)
@@ -247,6 +247,11 @@ static sal_uInt16 GetKeyCode(int keyval)
 nCode = KEY_A + (keyval - Qt::Key_A);
 else if (keyval >= Qt::Key_F1 && keyval <= Qt::Key_F26)
 nCode = KEY_F1 + (keyval - Qt::Key_F1);
+else if (modifiers.testFlag(Qt::KeypadModifier)
+ && (keyval == Qt::Key_Period || keyval == Qt::Key_Comma))
+// Qt doesn't use a special keyval for decimal separator ("," or ".")
+// on numerical keypad, but sets Qt::KeypadModifier in addition
+nCode = KEY_DECIMAL;
 else
 {
 switch (keyval)
@@ -385,7 +390,7 @@ bool Qt5Widget::handleKeyEvent(QKeyEvent* pEvent, bool 
bDown)
 
 aEvent.mnCharCode = (pEvent->text().isEmpty() ? 0 : 
pEvent->text().at(0).unicode());
 aEvent.mnRepeat = 0;
-aEvent.mnCode = GetKeyCode(pEvent->key());
+aEvent.mnCode = GetKeyCode(pEvent->key(), pEvent->modifiers());
 aEvent.mnCode |= GetKeyModCode(pEvent->modifiers());
 
 bool bStopProcessingKey;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: wsd/DocumentBroker.cpp wsd/TileCache.cpp wsd/TileCache.hpp

[Libreoffice Gerrit user]

 wsd/DocumentBroker.cpp |1 +
 wsd/TileCache.cpp  |   14 ++
 wsd/TileCache.hpp  |4 ++--
 3 files changed, 17 insertions(+), 2 deletions(-)

New commits:
commit 150d20cf37b2aa6112b13f73cf67b466f8a64975
Author: Michael Meeks 
AuthorDate: Fri Feb 15 20:42:00 2019 +0100
Commit: Michael Meeks 
CommitDate: Fri Feb 15 21:36:28 2019 +0100

TileCache: dumpState.

Change-Id: I6289f0b77eb0649be8254aa8c9647c47d4db3008

diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
index 2239079e6..e615b6d04 100644
--- a/wsd/DocumentBroker.cpp
+++ b/wsd/DocumentBroker.cpp
@@ -1888,6 +1888,7 @@ void DocumentBroker::dumpState(std::ostream& os)
 os << "\n  last saved: " << std::ctime(&t);
 os << "\n  cursor " << _cursorPosX << ", " << _cursorPosY
   << "( " << _cursorWidth << "," << _cursorHeight << ")\n";
+_tileCache->dumpState(os);
 
 _poll->dumpState(os);
 }
diff --git a/wsd/TileCache.cpp b/wsd/TileCache.cpp
index e87fe9214..a5dae27c6 100644
--- a/wsd/TileCache.cpp
+++ b/wsd/TileCache.cpp
@@ -559,4 +559,18 @@ TileCache::Tile TileCache::loadTile(const std::string 
&fileName)
 return TileCache::Tile();
 }
 
+void TileCache::dumpState(std::ostream& os)
+{
+size_t num = 0, size = 0;
+for (auto it : _cache)
+{
+num++; size += it.second->size();
+}
+os << "  tile cache: num: " << num << " size: " << size << " bytes\n";
+for (auto it : _cache)
+{
+os << "" /* << std::setw(4) << it.first->getWireId() */ << " - '" 
<< it.first << "' - " << it.second->size() << " bytes\n";
+}
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/wsd/TileCache.hpp b/wsd/TileCache.hpp
index 9f847fc5d..fe5a7ca34 100644
--- a/wsd/TileCache.hpp
+++ b/wsd/TileCache.hpp
@@ -91,11 +91,11 @@ public:
 bool hasTileBeingRendered(const TileDesc& tile);
 int getTileBeingRenderedVersion(const TileDesc& tile);
 
+// Debugging bits ...
+void dumpState(std::ostream& os);
 void setThreadOwner(const std::thread::id &id) { _owner = id; }
 void assertCorrectThread();
 
-
-
 private:
 void invalidateTiles(int part, int x, int y, int width, int height);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: configure.ac ios/config.h.in ios/ios.mm ios/Mobile loolwsd.xml.in Makefile.am test/run_unit.sh.in wsd/DocumentBroker.cpp wsd/DocumentBroker.hpp wsd/LOOLWSD.cpp wsd/LO

[Libreoffice Gerrit user]

 Makefile.am |   26 +---
 configure.ac|   15 -
 ios/Mobile/Document.mm  |6 -
 ios/Mobile/Resources/Settings.bundle/Root.plist |   10 -
 ios/config.h.in |3 --
 ios/ios.mm  |8 ---
 loolwsd.xml.in  |1 
 test/run_unit.sh.in |4 ---
 wsd/DocumentBroker.cpp  |   11 --
 wsd/DocumentBroker.hpp  |1 
 wsd/LOOLWSD.cpp |   17 ---
 wsd/LOOLWSD.hpp |2 -
 12 files changed, 6 insertions(+), 98 deletions(-)

New commits:
commit 8f71365f0f51c6f2b4144fd7c5674d23363a83bf
Author: Tor Lillqvist 
AuthorDate: Fri Feb 15 21:22:41 2019 +0200
Commit: Michael Meeks 
CommitDate: Fri Feb 15 21:36:16 2019 +0100

Remove unnecessary leftovers after Michael's removal of the on-disk tile 
cache

Change-Id: I435679b48f90d2580bb9c5c86a26c9a1d43c5b59
Reviewed-on: https://gerrit.libreoffice.org/67885
Reviewed-by: Michael Meeks 
Tested-by: Michael Meeks 

diff --git a/Makefile.am b/Makefile.am
index 401ad72e6..2a6a1ef5b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -270,15 +270,11 @@ $(SYSTEM_STAMP) : ${top_srcdir}/loolwsd-systemplate-setup
 @JAILS_PATH@ :
mkdir -p $@
 
-@TILECACHE_PATH@ :
-   mkdir -p $@
-
 clean-local:
if test "z@JAILS_PATH@" != "z"; then rm -rf "@JAILS_PATH@"; fi
if test "z@SYSTEMPLATE_PATH@" != "z"; then rm -rf "@SYSTEMPLATE_PATH@"; 
fi
-   if test "z@TILECACHE_PATH@" != "z"; then rm -rf "@TILECACHE_PATH@"; fi
 
-run: all @TILECACHE_PATH@ @JAILS_PATH@
+run: all @JAILS_PATH@
@echo "Launching loolwsd"
@fc-cache "@LO_PATH@"/share/fonts/truetype
@cp $(abs_top_srcdir)/test/data/hello.odt 
$(abs_top_srcdir)/test/data/hello-world.odt
@@ -287,14 +283,13 @@ run: all @TILECACHE_PATH@ @JAILS_PATH@
@echo
./loolwsd --o:sys_template_path="@SYSTEMPLATE_PATH@" 
--o:lo_template_path="@LO_PATH@" \
  --o:child_root_path="@JAILS_PATH@" 
--o:storage.filesystem[@allow]=true \
- --o:tile_cache_path="@TILECACHE_PATH@" \
  
--o:ssl.cert_file_path="$(abs_top_srcdir)/etc/cert.pem" \
  --o:ssl.key_file_path="$(abs_top_srcdir)/etc/key.pem" 
\
  
--o:ssl.ca_file_path="$(abs_top_srcdir)/etc/ca-chain.cert.pem" \
  --o:admin_console.username=admin 
--o:admin_console.password=admin \
  --o:logging.file[@enable]=true --o:logging.level=trace
 
-run-valgrind: all @TILECACHE_PATH@ @JAILS_PATH@
+run-valgrind: all @JAILS_PATH@
@echo "Launching loolwsd under valgrind (but not forkit/loolkit, yet)"
@fc-cache "@LO_PATH@"/share/fonts/truetype
@cp $(abs_top_srcdir)/test/data/hello.odt 
$(abs_top_srcdir)/test/data/hello-world.odt
@@ -303,14 +298,13 @@ run-valgrind: all @TILECACHE_PATH@ @JAILS_PATH@
valgrind --tool=memcheck --trace-children=no -v --read-var-info=yes \
./loolwsd --o:sys_template_path="@SYSTEMPLATE_PATH@" 
--o:lo_template_path="@LO_PATH@" \
  --o:child_root_path="@JAILS_PATH@" 
--o:storage.filesystem[@allow]=true \
- --o:tile_cache_path="@TILECACHE_PATH@" \
  
--o:ssl.cert_file_path="$(abs_top_srcdir)/etc/cert.pem" \
  --o:ssl.key_file_path="$(abs_top_srcdir)/etc/key.pem" 
\
  
--o:ssl.ca_file_path="$(abs_top_srcdir)/etc/ca-chain.cert.pem" \
  --o:admin_console.username=admin 
--o:admin_console.password=admin \
  --o:logging.file[@enable]=false 
--o:logging.level=trace
 
-run-gdb: all @TILECACHE_PATH@ @JAILS_PATH@
+run-gdb: all @JAILS_PATH@
@echo "Launching loolwsd under valgrind's callgrind"
@fc-cache "@LO_PATH@"/share/fonts/truetype
@cp $(abs_top_srcdir)/test/data/hello.odt 
$(abs_top_srcdir)/test/data/hello-world.odt
@@ -320,14 +314,13 @@ run-gdb: all @TILECACHE_PATH@ @JAILS_PATH@
./loolwsd --o:security.capabilities="false" \
  --o:sys_template_path="@SYSTEMPLATE_PATH@" 
--o:lo_template_path="@LO_PATH@" \
  --o:child_root_path="@JAILS_PATH@" 
--o:storage.filesystem[@allow]=true \
- --o:tile_cache_path="@TILECACHE_PATH@" \
  
--o:ssl.cert_file_path="$(abs_top_srcdir)/etc/cert.pem" \
  --o:ssl.key_file_path="$(abs_top_srcdir)/etc/key.pem" 
\
  
--o:ssl.ca_file_path="$(abs_top_srcdir)/etc/ca-chain.cert.pem" \
  --o:admin_console.username=admin 
--o:ad

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

[Libreoffice Gerrit user]

 sw/qa/extras/layout/layout.cxx |   20 
 sw/source/core/text/txtfrm.cxx |   30 ++
 2 files changed, 46 insertions(+), 4 deletions(-)

New commits:
commit 61bb90aac5038b5ff051668f7ae86eb61658e4f3
Author: Miklos Vajna 
AuthorDate: Fri Feb 15 16:52:20 2019 +0100
Commit: Miklos Vajna 
CommitDate: Fri Feb 15 21:23:57 2019 +0100

sw btlr writing mode shell: fix cursor position

By implementing the SwRect variant of
SwTextFrame::SwitchHorizontalToVertical() for the IsVertLRBT() == true
case.

The blinking cursor position after doc load is now correct.

Change-Id: I4862a6de286d3c0a34235fa0be8be2746b1a4151
Reviewed-on: https://gerrit.libreoffice.org/67880
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins

diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx
index d29cc476f9cc..cb94560ab03a 100644
--- a/sw/qa/extras/layout/layout.cxx
+++ b/sw/qa/extras/layout/layout.cxx
@@ -2816,6 +2816,26 @@ void SwLayoutWriter::testBtlrCell()
 // Actual  : 0', i.e. the AAA2 frame was not visible due to 0 width.
 pXmlDoc = parseLayoutDump();
 assertXPath(pXmlDoc, 
"/root/page/body/tab/row/cell[1]/txt[2]/infos/bounds", "width", "269");
+
+// Test the position of the cursor after doc load.
+// We expect that it's inside the first text frame in the first cell.
+// More precisely, this is a bottom to top vertical frame, so we expect 
it's at the start, which
+// means it's at the lower half of the text frame rectangle (vertically).
+SwWrtShell* pWrtShell = pShell->GetWrtShell();
+CPPUNIT_ASSERT(pWrtShell);
+
+const SwRect& rCharRect = pWrtShell->GetCharRect();
+SwTwips nFirstParaTop
+= getXPath(pXmlDoc, 
"/root/page/body/tab/row/cell[1]/txt[1]/infos/bounds", "top").toInt32();
+SwTwips nFirstParaHeight
+= getXPath(pXmlDoc, 
"/root/page/body/tab/row/cell[1]/txt[1]/infos/bounds", "height")
+  .toInt32();
+SwTwips nFirstParaMiddle = nFirstParaTop + nFirstParaHeight / 2;
+SwTwips nFirstParaBottom = nFirstParaTop + nFirstParaHeight;
+// Without the accompanying fix in place, this test would have failed: the 
lower half (vertical)
+// range was 2273 -> 2835, the good vertical position is 2730, the bad one 
was 1830.
+CPPUNIT_ASSERT_GREATER(nFirstParaMiddle, rCharRect.Top());
+CPPUNIT_ASSERT_LESS(nFirstParaBottom, rCharRect.Top());
 #endif
 }
 
diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx
index 17d1d6f321fc..8902ca0483ca 100644
--- a/sw/source/core/text/txtfrm.cxx
+++ b/sw/source/core/text/txtfrm.cxx
@@ -478,8 +478,18 @@ void SwTextFrame::SwitchHorizontalToVertical( SwRect& 
rRect ) const
 long nOfstX, nOfstY;
 if ( IsVertLR() )
 {
-nOfstX = rRect.Left() - getFrameArea().Left();
-nOfstY = rRect.Top() - getFrameArea().Top();
+if (IsVertLRBT())
+{
+// X and Y offsets here mean the position of the point that will 
be the top left corner
+// after the switch.
+nOfstX = rRect.Left() + rRect.Width() - getFrameArea().Left();
+nOfstY = rRect.Top() - getFrameArea().Top();
+}
+else
+{
+nOfstX = rRect.Left() - getFrameArea().Left();
+nOfstY = rRect.Top() - getFrameArea().Top();
+}
 }
 else
 {
@@ -491,7 +501,12 @@ void SwTextFrame::SwitchHorizontalToVertical( SwRect& 
rRect ) const
 const long nHeight = rRect.Height();
 
 if ( IsVertLR() )
-rRect.Left(getFrameArea().Left() + nOfstY);
+{
+if (IsVertLRBT())
+rRect.Left(getFrameArea().Left() + nOfstY);
+else
+rRect.Left(getFrameArea().Left() + nOfstY);
+}
 else
 {
 if ( mbIsSwapped )
@@ -501,7 +516,14 @@ void SwTextFrame::SwitchHorizontalToVertical( SwRect& 
rRect ) const
 rRect.Left( getFrameArea().Left() + getFrameArea().Width() - 
nOfstY );
 }
 
-rRect.Top( getFrameArea().Top() + nOfstX );
+if (IsVertLRBT())
+{
+SAL_WARN_IF(!mbIsSwapped, "sw.core",
+"SwTextFrame::SwitchHorizontalToVertical, IsVertLRBT, not 
swapped");
+rRect.Top(getFrameArea().Top() + getFrameArea().Width() - nOfstX);
+}
+else
+rRect.Top(getFrameArea().Top() + nOfstX);
 rRect.Width( nHeight );
 rRect.Height( nWidth );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: extras/source sc/inc sc/source sc/uiconfig solenv/bin

[Libreoffice Gerrit user]

 extras/source/glade/libreoffice-catalog.xml.in |4 
 sc/inc/scabstdlg.hxx   |8 
 sc/source/ui/attrdlg/scdlgfact.cxx |   21 +
 sc/source/ui/attrdlg/scdlgfact.hxx |   16 +
 sc/source/ui/dbgui/PivotLayoutTreeListData.cxx |2 
 sc/source/ui/dbgui/pvfundlg.cxx|  274 +++--
 sc/source/ui/inc/pvfundlg.hxx  |   57 +
 sc/uiconfig/scalc/ui/datafielddialog.ui|   40 +++
 solenv/bin/native-code.py  |1 
 9 files changed, 204 insertions(+), 219 deletions(-)

New commits:
commit 490269200e40ead201cc48b450b5e4b1d8147e24
Author: Caolán McNamara 
AuthorDate: Fri Feb 15 16:12:35 2019 +
Commit: Caolán McNamara 
CommitDate: Fri Feb 15 20:50:04 2019 +0100

weld ScDPFunctionDlg

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

diff --git a/extras/source/glade/libreoffice-catalog.xml.in 
b/extras/source/glade/libreoffice-catalog.xml.in
index 3bf825820cd8..1d98ea2862bf 100644
--- a/extras/source/glade/libreoffice-catalog.xml.in
+++ b/extras/source/glade/libreoffice-catalog.xml.in
@@ -469,10 +469,6 @@
 generic-name="CondFormatList" parent="GtkDrawingArea"
 icon-name="widget-gtk-drawingarea"/>
 
-
-
 
diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index 1d6e00d26c8f..9fc0bdbf32a7 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -471,10 +471,10 @@ public:
 virtual VclPtr 
CreateScPivotFilterDlg(vcl::Window* pParent,
 const SfxItemSet& rArgSet, sal_uInt16 nSourceTab) = 0;
 
-virtual VclPtr CreateScDPFunctionDlg( 
vcl::Window* pParent,
-const 
ScDPLabelDataVector& rLabelVec,
-const 
ScDPLabelData& rLabelData,
-const 
ScPivotFuncData& rFuncData ) = 0;
+virtual VclPtr 
CreateScDPFunctionDlg(weld::Window* pParent,
+  const 
ScDPLabelDataVector& rLabelVec,
+  const 
ScDPLabelData& rLabelData,
+  const 
ScPivotFuncData& rFuncData ) = 0;
 
 virtual VclPtr 
CreateScDPSubtotalDlg(weld::Window* pParent,
   ScDPObject& 
rDPObj,
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx 
b/sc/source/ui/attrdlg/scdlgfact.cxx
index e3125c60ce06..b99de9b218f8 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -166,7 +166,11 @@ short AbstractScNamePasteDlg_Impl::Execute()
 }
 
 IMPL_ABSTDLG_BASE(AbstractScPivotFilterDlg_Impl);
-IMPL_ABSTDLG_BASE(AbstractScDPFunctionDlg_Impl);
+
+short AbstractScDPFunctionDlg_Impl::Execute()
+{
+return m_xDlg->run();
+}
 
 short AbstractScDPSubtotalDlg_Impl::Execute()
 {
@@ -609,12 +613,12 @@ const ScQueryItem&   
AbstractScPivotFilterDlg_Impl::GetOutputItem()
 
 PivotFunc AbstractScDPFunctionDlg_Impl::GetFuncMask() const
 {
- return pDlg->GetFuncMask();
+ return m_xDlg->GetFuncMask();
 }
 
 css::sheet::DataPilotFieldReference 
AbstractScDPFunctionDlg_Impl::GetFieldRef() const
 {
-return pDlg->GetFieldRef();
+return m_xDlg->GetFieldRef();
 }
 
 PivotFunc AbstractScDPSubtotalDlg_Impl::GetFuncMask() const
@@ -910,13 +914,12 @@ VclPtr 
ScAbstractDialogFactory_Impl::CreateScPivotFilt
 return VclPtr::Create(pDlg);
 }
 
-VclPtr 
ScAbstractDialogFactory_Impl::CreateScDPFunctionDlg ( vcl::Window* pParent,
-const 
ScDPLabelDataVector& rLabelVec,
-const 
ScDPLabelData& rLabelData,
-const 
ScPivotFuncData& rFuncData )
+VclPtr 
ScAbstractDialogFactory_Impl::CreateScDPFunctionDlg(weld::Window* pParent,
+   
 const ScDPLabelDataVector& rLabelVec,
+   
 const ScDPLabelData& rLabelData,
+   
 const ScPivotFuncData& rFuncData)
 {
-VclPtr pDlg = VclPtr::Create( pParent, 
rLabelVec, rLabelData, rFuncData );
-return VclPtr::Create( pDlg );
+return 
VclPtr::Create(std::make_unique(pParent,
 rLabelVec, rLabelData, rFuncData));
 }
 
 VclPtr 
ScAbstractDialogFactory_Impl::CreateScDPSubtotalDlg(weld::Window* pParent,
diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx 
b/sc/source/ui/attrdlg/scdlgfact.hxx

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

[Libreoffice Gerrit user]

 sc/source/ui/dbgui/pvfundlg.cxx|  348 ++---
 sc/source/ui/inc/pvfundlg.hxx  |   54 +--
 sc/uiconfig/scalc/ui/datafieldoptionsdialog.ui |   79 -
 3 files changed, 290 insertions(+), 191 deletions(-)

New commits:
commit dfdd717ce172d1589001eec9cd4b0a039c8e7260
Author: Caolán McNamara 
AuthorDate: Fri Feb 15 14:39:21 2019 +
Commit: Caolán McNamara 
CommitDate: Fri Feb 15 20:49:11 2019 +0100

weld ScDPSubtotalOptDlg

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

diff --git a/sc/source/ui/dbgui/pvfundlg.cxx b/sc/source/ui/dbgui/pvfundlg.cxx
index bec114c331c0..fb90a2abbd64 100644
--- a/sc/source/ui/dbgui/pvfundlg.cxx
+++ b/sc/source/ui/dbgui/pvfundlg.cxx
@@ -72,6 +72,22 @@ bool lclFillListBox( ListBoxType& rLBox, const Sequence< 
OUString >& rStrings, s
 return bEmpty;
 }
 
+bool lclFillListBox(weld::ComboBox& rLBox, const Sequence< OUString >& 
rStrings)
+{
+bool bEmpty = false;
+for (const OUString& str : rStrings)
+{
+if (!str.isEmpty())
+rLBox.append_text(str);
+else
+{
+rLBox.append_text(ScResId(STR_EMPTYDATA));
+bEmpty = true;
+}
+}
+return bEmpty;
+}
+
 template< typename ListBoxType >
 bool lclFillListBox( ListBoxType& rLBox, const vector& 
rMembers, sal_Int32 nEmptyPos = LISTBOX_APPEND )
 {
@@ -90,6 +106,27 @@ bool lclFillListBox( ListBoxType& rLBox, const 
vector& rM
 return bEmpty;
 }
 
+bool lclFillListBox(weld::TreeView& rLBox, const 
vector& rMembers)
+{
+bool bEmpty = false;
+for (const auto& rMember : rMembers)
+{
+rLBox.insert(nullptr, -1, nullptr, nullptr,
+ nullptr, nullptr, nullptr, false);
+int pos = rLBox.n_children() - 1;
+rLBox.set_toggle(pos, false, 0);
+OUString aName = rMember.getDisplayName();
+if (!aName.isEmpty())
+rLBox.set_text(pos, aName, 1);
+else
+{
+rLBox.set_text(pos, ScResId(STR_EMPTYDATA), 1);
+bEmpty = true;
+}
+}
+return bEmpty;
+}
+
 /** This table represents the order of the strings in the resource string 
array. */
 static const PivotFunc spnFunctions[] =
 {
@@ -130,21 +167,6 @@ static const ScDPListBoxWrapper::MapEntryType 
spRefTypeMap[] =
 { WRAPPER_LISTBOX_ENTRY_NOTFOUND,   DataPilotFieldReferenceType::NONE  
 }
 };
 
-static const ScDPListBoxWrapper::MapEntryType spLayoutMap[] =
-{
-{ 0,DataPilotFieldLayoutMode::TABULAR_LAYOUT   
 },
-{ 1,
DataPilotFieldLayoutMode::OUTLINE_SUBTOTALS_TOP },
-{ 2,
DataPilotFieldLayoutMode::OUTLINE_SUBTOTALS_BOTTOM  },
-{ WRAPPER_LISTBOX_ENTRY_NOTFOUND,   
DataPilotFieldLayoutMode::TABULAR_LAYOUT}
-};
-
-static const ScDPListBoxWrapper::MapEntryType spShowFromMap[] =
-{
-{ 0,DataPilotFieldShowItemsMode::FROM_TOP   },
-{ 1,DataPilotFieldShowItemsMode::FROM_BOTTOM},
-{ WRAPPER_LISTBOX_ENTRY_NOTFOUND,   DataPilotFieldShowItemsMode::FROM_TOP }
-};
-
 } // namespace
 
 ScDPFunctionListBox::ScDPFunctionListBox(vcl::Window* pParent, WinBits nStyle)
@@ -522,110 +544,140 @@ IMPL_LINK( ScDPSubtotalDlg, ClickHdl, Button*, pBtn, 
void )
 {
 if (pBtn == mpBtnOptions)
 {
-VclPtrInstance< ScDPSubtotalOptDlg > pDlg( this, mrDPObj, maLabelData, 
mrDataFields, mbEnableLayout );
-if( pDlg->Execute() == RET_OK )
-pDlg->FillLabelData( maLabelData );
+ScDPSubtotalOptDlg aDlg(GetFrameWeld(), mrDPObj, maLabelData, 
mrDataFields, mbEnableLayout);
+if (aDlg.run() == RET_OK)
+aDlg.FillLabelData(maLabelData);
+}
+}
+
+namespace
+{
+int FromDataPilotFieldLayoutMode(int eMode)
+{
+switch (eMode)
+{
+case DataPilotFieldLayoutMode::TABULAR_LAYOUT:
+return 0;
+case DataPilotFieldLayoutMode::OUTLINE_SUBTOTALS_TOP:
+return 1;
+case DataPilotFieldLayoutMode::OUTLINE_SUBTOTALS_BOTTOM:
+return 2;
+}
+return -1;
+}
+
+int ToDataPilotFieldLayoutMode(int nPos)
+{
+switch (nPos)
+{
+case 0:
+return DataPilotFieldLayoutMode::TABULAR_LAYOUT;
+case 1:
+return DataPilotFieldLayoutMode::OUTLINE_SUBTOTALS_TOP;
+case 2:
+return DataPilotFieldLayoutMode::OUTLINE_SUBTOTALS_BOTTOM;
+}
+return DataPilotFieldLayoutMode::TABULAR_LAYOUT;
+}
+
+int FromDataPilotFieldShowItemsMode(int eMode)
+{
+switch (eMode)
+{
+case DataPilotFieldShowItemsMode::FROM_TOP:
+return 0;
+   

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

[Libreoffice Gerrit user]

 chart2/source/controller/dialogs/tp_AxisPositions.cxx |2 +-
 chart2/source/controller/dialogs/tp_Scale.cxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 6987f1d3982c369fef401d2fbe3714f68f4398ab
Author: Stephan Bergmann 
AuthorDate: Fri Feb 15 19:20:26 2019 +0100
Commit: Stephan Bergmann 
CommitDate: Fri Feb 15 20:50:31 2019 +0100

These items are of type SfxUInt32Item

...see include/svx/svxids.hrc for SID_ATTR_NUMBERFORMAT_VALUE and
chart2/source/inc/chartview/ChartSfxItemIds.hxx for
SCHATTR_AXIS_CROSSING_MAIN_AXIS_NUMBERFORMAT, and as reported by
-fsanitize=vptr in sc/qa/uitest/chart/tdf122398.py recently added to
UITest_chart ().

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

diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.cxx 
b/chart2/source/controller/dialogs/tp_AxisPositions.cxx
index 3fdc197f6583..15a6bda7e859 100644
--- a/chart2/source/controller/dialogs/tp_AxisPositions.cxx
+++ b/chart2/source/controller/dialogs/tp_AxisPositions.cxx
@@ -243,7 +243,7 @@ void AxisPositionsTabPage::SetNumFormatter( 
SvNumberFormatter* pFormatter )
 const SfxPoolItem *pPoolItem = nullptr;
 if( GetItemSet().GetItemState( 
SCHATTR_AXIS_CROSSING_MAIN_AXIS_NUMBERFORMAT, true, &pPoolItem ) == 
SfxItemState::SET )
 {
-sal_uLong nFmt = static_cast(static_cast(pPoolItem)->GetValue());
+sal_uLong nFmt = static_cast(pPoolItem)->GetValue();
 m_xED_CrossesAt->set_format_key( nFmt );
 }
 }
diff --git a/chart2/source/controller/dialogs/tp_Scale.cxx 
b/chart2/source/controller/dialogs/tp_Scale.cxx
index ddd305762e24..fc0375d9c60c 100644
--- a/chart2/source/controller/dialogs/tp_Scale.cxx
+++ b/chart2/source/controller/dialogs/tp_Scale.cxx
@@ -500,7 +500,7 @@ void ScaleTabPage::SetNumFormat()
 
 if( GetItemSet().GetItemState( SID_ATTR_NUMBERFORMAT_VALUE, true, 
&pPoolItem ) == SfxItemState::SET )
 {
-sal_uLong nFmt = static_cast(static_cast(pPoolItem)->GetValue());
+sal_uLong nFmt = static_cast(pPoolItem)->GetValue();
 
 m_xFmtFldMax->set_format_key(nFmt);
 m_xFmtFldMin->set_format_key(nFmt);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sc/inc/scabstdlg.hxx   |   10 +-
 sc/source/ui/attrdlg/scdlgfact.cxx |   23 ++--
 sc/source/ui/attrdlg/scdlgfact.hxx |   18 ++-
 sc/source/ui/dbgui/PivotLayoutTreeList.cxx |2 
 sc/source/ui/dbgui/pvfundlg.cxx|  136 +
 sc/source/ui/inc/pvfundlg.hxx  |   50 +++---
 sc/uiconfig/scalc/ui/pivotfielddialog.ui   |   95 
 7 files changed, 203 insertions(+), 131 deletions(-)

New commits:
commit ce31d3cd23510fb545b0f923ea24fb3cb5303780
Author: Caolán McNamara 
AuthorDate: Fri Feb 15 15:34:47 2019 +
Commit: Caolán McNamara 
CommitDate: Fri Feb 15 20:49:32 2019 +0100

weld ScDPSubtotalDlg

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

diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index 9b16e1a26af5..1d6e00d26c8f 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -476,11 +476,11 @@ public:
 const 
ScDPLabelData& rLabelData,
 const 
ScPivotFuncData& rFuncData ) = 0;
 
-virtual VclPtr CreateScDPSubtotalDlg( 
vcl::Window* pParent,
-ScDPObject& 
rDPObj,
-const 
ScDPLabelData& rLabelData,
-const 
ScPivotFuncData& rFuncData,
-const 
ScDPNameVec& rDataFields ) = 0;
+virtual VclPtr 
CreateScDPSubtotalDlg(weld::Window* pParent,
+  ScDPObject& 
rDPObj,
+  const 
ScDPLabelData& rLabelData,
+  const 
ScPivotFuncData& rFuncData,
+  const 
ScDPNameVec& rDataFields) = 0;
 
 virtual VclPtr 
CreateScDPNumGroupDlg(weld::Window* pParent,
   const 
ScDPNumGroupInfo& rInfo) = 0;
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx 
b/sc/source/ui/attrdlg/scdlgfact.cxx
index bd39b1bb7be3..e3125c60ce06 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -167,7 +167,11 @@ short AbstractScNamePasteDlg_Impl::Execute()
 
 IMPL_ABSTDLG_BASE(AbstractScPivotFilterDlg_Impl);
 IMPL_ABSTDLG_BASE(AbstractScDPFunctionDlg_Impl);
-IMPL_ABSTDLG_BASE(AbstractScDPSubtotalDlg_Impl);
+
+short AbstractScDPSubtotalDlg_Impl::Execute()
+{
+return m_xDlg->run();
+}
 
 short AbstractScDPNumGroupDlg_Impl::Execute()
 {
@@ -615,12 +619,12 @@ css::sheet::DataPilotFieldReference 
AbstractScDPFunctionDlg_Impl::GetFieldRef()
 
 PivotFunc AbstractScDPSubtotalDlg_Impl::GetFuncMask() const
 {
- return pDlg->GetFuncMask();
+ return m_xDlg->GetFuncMask();
 }
 
 void AbstractScDPSubtotalDlg_Impl::FillLabelData( ScDPLabelData& rLabelData ) 
const
 {
-pDlg->FillLabelData( rLabelData );
+m_xDlg->FillLabelData( rLabelData );
 }
 
 ScDPNumGroupInfo AbstractScDPNumGroupDlg_Impl::GetGroupInfo() const
@@ -915,14 +919,13 @@ VclPtr 
ScAbstractDialogFactory_Impl::CreateScDPFunction
 return VclPtr::Create( pDlg );
 }
 
-VclPtr 
ScAbstractDialogFactory_Impl::CreateScDPSubtotalDlg ( vcl::Window* pParent,
-ScDPObject& 
rDPObj,
-const 
ScDPLabelData& rLabelData,
-const 
ScPivotFuncData& rFuncData,
-const 
ScDPNameVec& rDataFields )
+VclPtr 
ScAbstractDialogFactory_Impl::CreateScDPSubtotalDlg(weld::Window* pParent,
+   
 ScDPObject& rDPObj,
+   
 const ScDPLabelData& rLabelData,
+   
 const ScPivotFuncData& rFuncData,
+   
 const ScDPNameVec& rDataFields)
 {
-VclPtr pDlg = VclPtr::Create( pParent, 
rDPObj, rLabelData, rFuncData, rDataFields, true/*bEnableLayout*/ );
-return VclPtr::Create( pDlg );
+return 
VclPtr::Create(std::make_unique(pParent,
 rDPObj, rLabelData, rFuncData, rDataFields, true/*bEnableLayout*/));
 }
 
 VclPtr 
ScAbstractDialogFactory_Impl::CreateScDPNumGroupDlg(weld::Window* pParent, 
const ScDPNumGroupInfo& rInfo)
diff --git a/s

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

[Libreoffice Gerrit user]

 vcl/qa/cppunit/bitmaprender/BitmapRenderTest.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit f54ed990f49dce9eecec1916c8beaa4280bfbcf1
Author: Tomaž Vajngerl 
AuthorDate: Fri Feb 15 19:36:21 2019 +0100
Commit: Tomaž Vajngerl 
CommitDate: Fri Feb 15 19:39:58 2019 +0100

disble test of rendering BitmapEx with alpha on Windows for now

Tinderboxes fail, but Jenkins was fine so we must have problems
with rounding errors in some code paths.

Change-Id: I38a457c0ee7a079bebaa599794b0e65c433dfe64

diff --git a/vcl/qa/cppunit/bitmaprender/BitmapRenderTest.cxx 
b/vcl/qa/cppunit/bitmaprender/BitmapRenderTest.cxx
index e770f1a4cc86..38b2aa6d8912 100644
--- a/vcl/qa/cppunit/bitmaprender/BitmapRenderTest.cxx
+++ b/vcl/qa/cppunit/bitmaprender/BitmapRenderTest.cxx
@@ -119,7 +119,11 @@ void BitmapRenderTest::testDrawBitmap32()
 
 CPPUNIT_ASSERT_EQUAL(COL_WHITE, pVDev->GetPixel(Point(0, 0)));
 CPPUNIT_ASSERT_EQUAL(COL_YELLOW, pVDev->GetPixel(Point(1, 1)));
+
+// sometimes on windows we get roundign error in blending so let's ignore this 
on Windows for now.
+#if !defined(_WIN32)
 CPPUNIT_ASSERT_EQUAL(Color(0x00, 0x7F, 0xFF, 0x7F), 
pVDev->GetPixel(Point(2, 2)));
+#endif
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(BitmapRenderTest);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/msforms' - 4 commits - officecfg/registry sw/inc sw/Library_swui.mk sw/sdi sw/source sw/uiconfig sw/UIConfig_swriter.mk

[Libreoffice Gerrit user]

Rebased ref, commits from common ancestor:
commit 1995af364f6d6d0532210583eb7c26a3f9368f68
Author: Tamás Zolnai 
AuthorDate: Fri Feb 15 17:50:18 2019 +0100
Commit: Tamás Zolnai 
CommitDate: Fri Feb 15 19:24:01 2019 +0100

MSForms: Rework the MS compatible Forms menu a bit

* DateField is saved as a content control in MSO file formats
so let have it under content controls submenu
* The MS compatible forms menu is a Writer specific thing so better
to have the related commands as Writer commands.

Change-Id: I2d66130f54c055a422f56b18ff2c98667e4f6469

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 5e8709ba4938..ccaed35731b0 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -6833,16 +6833,6 @@
   More Fields
 
   
-  
-
-  ActiveX Controls
-
-  
-  
-
-  Legacy Forms
-
-  
 
   
 
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index cc136f04a7c6..e88f44c8e6ce 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -3402,6 +3402,21 @@
   1
 
   
+  
+
+  ActiveX Controls
+
+  
+  
+
+  Legacy Form Fields
+
+  
+  
+
+  Content Controls
+
+  
 
   
 
diff --git a/sw/uiconfig/swriter/menubar/mscompatibleformsmenu.xml 
b/sw/uiconfig/swriter/menubar/mscompatibleformsmenu.xml
index 4c8e34467d3e..4d157908dd71 100644
--- a/sw/uiconfig/swriter/menubar/mscompatibleformsmenu.xml
+++ b/sw/uiconfig/swriter/menubar/mscompatibleformsmenu.xml
@@ -21,7 +21,6 @@
   
   
   
-  
 
   
   
@@ -31,6 +30,11 @@
   
 
   
+  
+
+  
+
+  
 
   
 
commit a764f7bb8fc799950a74eae98743664abca0297b
Author: Tamás Zolnai 
AuthorDate: Fri Feb 15 14:11:37 2019 +0100
Commit: Tamás Zolnai 
CommitDate: Fri Feb 15 19:24:00 2019 +0100

MSForms: Make Control Properties menu to work with drop-down form field

Always forward the Execute and State method to the form shell,
so if a form control is selected the Control Properites will
work correctly.
Otherwise we check whether there is any field next to the cursor.

Change-Id: I25055c17d887a2f2a716d8325f46825cc408179e

diff --git a/sw/sdi/_textsh.sdi b/sw/sdi/_textsh.sdi
index f8c2daee6d65..3724ee041ecc 100644
--- a/sw/sdi/_textsh.sdi
+++ b/sw/sdi/_textsh.sdi
@@ -1694,5 +1694,11 @@ interface BaseText
 StateMethod = StateField ;
 ]
 
+SID_FM_CTL_PROPERTIES
+[
+ExecMethod = Execute ;
+StateMethod = GetState ;
+]
+
 }  // end of interface text
 
diff --git a/sw/source/uibase/shells/textsh1.cxx 
b/sw/source/uibase/shells/textsh1.cxx
index fd759463b971..270fcabc08dc 100644
--- a/sw/source/uibase/shells/textsh1.cxx
+++ b/sw/source/uibase/shells/textsh1.cxx
@@ -119,6 +119,8 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 
 using namespace ::com::sun::star;
 using namespace com::sun::star::beans;
@@ -1367,6 +1369,32 @@ void SwTextShell::Execute(SfxRequest &rReq)
 GetView().UpdateWordCount(this, nSlot);
 }
 break;
+case SID_FM_CTL_PROPERTIES:
+{
+SwPosition aPos(*GetShell().GetCursor()->GetPoint());
+sw::mark::IFieldmark* pFieldBM = 
GetShell().getIDocumentMarkAccess()->getFieldmarkFor(aPos);
+if ( !pFieldBM )
+{
+--aPos.nContent;
+pFieldBM = 
GetShell().getIDocumentMarkAccess()->getFieldmarkFor(aPos);
+}
+
+if ( pFieldBM && pFieldBM->GetFieldname() == ODF_FORMDROPDOWN )
+{
+SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
+ScopedVclPtr 
pDlg(pFact->CreateDropDownFormFieldDialog(rWrtSh.GetView().GetFrameWeld(), 
pFieldBM));
+pDlg->Execute();
+pFieldBM->Invalidate();
+rWrtSh.InvalidateWindows( rWrtSh.GetView().GetVisArea() );
+}
+else
+{
+SfxRequest aReq( GetView().GetViewFrame(), SID_FM_CTL_PROPERTIES );
+aReq.AppendItem( SfxBoolItem( SID_FM_CTL_PROPERTIES, true ) );
+rWrtSh.GetView().GetFormShell()->Execute( aReq );
+}
+}
+break;
 default:
 OSL_ENSURE(false, "wrong dispatcher");
 return;
@@ -1906,6 +1934,37 @@ void SwTextShell::GetState( SfxItemSet &rSet )
 rSet.DisableItem(nWhich);
 }
 break;
+case SID_FM_CTL_PROPERTIES:
+   

[Libreoffice-commits] online.git: android/app

[Libreoffice Gerrit user]

 android/app/src/main/cpp/androidapp.cpp|   84 
+++---
 android/app/src/main/java/org/libreoffice/androidapp/MainActivity.java |   26 
+--
 2 files changed, 42 insertions(+), 68 deletions(-)

New commits:
commit 40ffc4306a26e59c5bf38576420baabd61921ca8
Author: Jan Holesovsky 
AuthorDate: Fri Feb 15 18:45:18 2019 +0100
Commit: Jan Holesovsky 
CommitDate: Fri Feb 15 18:45:18 2019 +0100

android: Passing messages from the native code to JS (incomplete).

Later we can come up with a way how to call it directly, but for the
moment, the indirection through Java is the easiest to implement.

Incomplete, needs a bit of more work to work from the thread.

Change-Id: I85ec997e32b5bd7d809142307e6fbaf42fc6ec2d

diff --git a/android/app/src/main/cpp/androidapp.cpp 
b/android/app/src/main/cpp/androidapp.cpp
index 763cf672f..ab6f1586e 100644
--- a/android/app/src/main/cpp/androidapp.cpp
+++ b/android/app/src/main/cpp/androidapp.cpp
@@ -20,6 +20,8 @@
 #include 
 #include 
 
+#include "Poco/Base64Encoder.h"
+
 const int SHOW_JS_MAXLEN = 70;
 
 int loolwsd_server_socket_fd = -1;
@@ -29,15 +31,7 @@ static LOOLWSD *loolwsd = nullptr;
 static int fakeClientFd;
 static int closeNotificationPipeForForwardingThread[2];
 
-#if 0
-static void send2JS_ready_callback(GObject  *source_object,
-   GAsyncResult *res,
-   gpointer  user_data)
-{
-free(user_data);
-}
-
-static void send2JS(const std::vector& buffer)
+static void send2JS(JNIEnv *env, jobject obj, const std::vector& buffer)
 {
 LOG_TRC_NOFILE("Send to JS: " << 
LOOLProtocol::getAbbreviatedMessage(buffer.data(), buffer.size()));
 
@@ -53,11 +47,16 @@ static void send2JS(const std::vector& buffer)
 if (newline != nullptr)
 {
 // The data needs to be an ArrayBuffer
-js = "window.TheFakeWebSocket.onmessage({'data': 
Base64ToArrayBuffer('";
-gchar *base64 = g_base64_encode((const guchar*)buffer.data(), 
buffer.size());
-js = js + std::string(base64);
-g_free(base64);
-js = js + "')});";
+std::stringstream ss;
+ss << "Base64ToArrayBuffer('";
+
+Poco::Base64Encoder encoder(ss);
+encoder << std::string(buffer.data(), buffer.size());
+encoder.close();
+
+ss << "')";
+
+js = ss.str();
 }
 else
 {
@@ -79,59 +78,26 @@ static void send2JS(const std::vector& buffer)
 }
 data.push_back(0);
 
-js = "window.TheFakeWebSocket.onmessage({'data': '";
-js = js + std::string(buffer.data(), buffer.size());
-js = js + "'});";
+js = std::string(data.data(), data.size());
 }
 
 std::string subjs = js.substr(0, 
std::min(std::string::size_type(SHOW_JS_MAXLEN), js.length()));
 if (js.length() > SHOW_JS_MAXLEN)
 subjs += "...";
 
-LOG_TRC_NOFILE( "Evaluating JavaScript: " << subjs);
-
-char *jscopy = strdup(js.c_str());
-g_idle_add([](gpointer data)
-   {
-   char *jscopy = (char*) data;
-   webkit_web_view_run_javascript(webView, jscopy, nullptr, 
send2JS_ready_callback, jscopy);
-   return FALSE;
-   }, jscopy);
-}
+LOG_TRC_NOFILE( "Sending to JavaScript: " << subjs);
 
-static char *js_result_as_gstring(WebKitJavascriptResult *js_result)
-{
-#if WEBKIT_CHECK_VERSION(2,22,0) // unclear when this API changed ...
-JSCValue *value = webkit_javascript_result_get_js_value(js_result);
-if (jsc_value_is_string(value))
-return jsc_value_to_string(value);
-else
-return nullptr;
-#else // older Webkits
-JSValueRef value = webkit_javascript_result_get_value(js_result);
-JSContextRef ctx = webkit_javascript_result_get_global_context(js_result);
-if (JSValueIsString(ctx, value))
-{
-const JSStringRef js_str = JSValueToStringCopy(ctx, value, nullptr);
-size_t gstring_max = JSStringGetMaximumUTF8CStringSize(js_str);
-char *gstring = (char *)g_malloc(gstring_max);
-if (gstring)
-JSStringGetUTF8CString(js_str, gstring, gstring_max);
-else
-LOG_TRC_NOFILE("No string");
-JSStringRelease(js_str);
-return gstring;
-}
-else
-LOG_TRC_NOFILE("Unexpected object type " << JSValueGetType(ctx, 
value));
-return nullptr;
-#endif
+/* TODO commented out, see the other TODO wrt. the NewGlobalRef
+jstring jstr = env->NewStringUTF(js.c_str());
+jclass clazz = env->FindClass("org/libreoffice/androidapp/MainActivity");
+jmethodID callFakeWebsocket = env->GetMethodID(clazz, 
"callFakeWebsocketOnMessage", "(V)Ljava/lang/String;");
+env->CallObjectMethod(obj, callFakeWebsocket, jstr);
+*/
 }
-#endif
 
 /// Handle a message from JavaScript.
 extern "C" JNIEXPORT void JNICALL
-Java_org_libreoffice_androidapp_MainActivity_postMobileMessage(JNIEnv *en

[Libreoffice-commits] core.git: Branch 'feature/msforms' - 10 commits - framework/inc framework/source include/svtools include/unotools include/xmloff officecfg/registry svtools/source svtools/uiconfi

[Libreoffice Gerrit user]

Rebased ref, commits from common ancestor:
commit 11443d390bdecf5624bafe7c358c6232418cfb60
Author: Tamás Zolnai 
AuthorDate: Fri Feb 15 17:50:18 2019 +0100
Commit: Tamás Zolnai 
CommitDate: Fri Feb 15 18:43:17 2019 +0100

MSForms: Rework the MS compatible Forms menu a bit

* DateField is saved as a content control in MSO file formats
so let have it under content controls submenu
* The MS compatible forms menu is a Writer specific thing so better
to have the related commands as Writer commands.

Change-Id: I2d66130f54c055a422f56b18ff2c98667e4f6469

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 5e8709ba4938..ccaed35731b0 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -6833,16 +6833,6 @@
   More Fields
 
   
-  
-
-  ActiveX Controls
-
-  
-  
-
-  Legacy Forms
-
-  
 
   
 
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index cc136f04a7c6..e88f44c8e6ce 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -3402,6 +3402,21 @@
   1
 
   
+  
+
+  ActiveX Controls
+
+  
+  
+
+  Legacy Form Fields
+
+  
+  
+
+  Content Controls
+
+  
 
   
 
diff --git a/sw/uiconfig/swriter/menubar/mscompatibleformsmenu.xml 
b/sw/uiconfig/swriter/menubar/mscompatibleformsmenu.xml
index 4c8e34467d3e..4d157908dd71 100644
--- a/sw/uiconfig/swriter/menubar/mscompatibleformsmenu.xml
+++ b/sw/uiconfig/swriter/menubar/mscompatibleformsmenu.xml
@@ -21,7 +21,6 @@
   
   
   
-  
 
   
   
@@ -31,6 +30,11 @@
   
 
   
+  
+
+  
+
+  
 
   
 
commit a83f9ab2de23f99c8e6f161f8fceac517b19e97f
Author: Tamás Zolnai 
AuthorDate: Fri Feb 15 14:11:37 2019 +0100
Commit: Tamás Zolnai 
CommitDate: Fri Feb 15 18:42:53 2019 +0100

MSForms: Make Control Properties menu to work with drop-down form field

Always forward the Execute and State method to the form shell,
so if a form control is selected the Control Properites will
work correctly.
Otherwise we check whether there is any field next to the cursor.

Change-Id: I25055c17d887a2f2a716d8325f46825cc408179e

diff --git a/sw/sdi/_textsh.sdi b/sw/sdi/_textsh.sdi
index f8c2daee6d65..3724ee041ecc 100644
--- a/sw/sdi/_textsh.sdi
+++ b/sw/sdi/_textsh.sdi
@@ -1694,5 +1694,11 @@ interface BaseText
 StateMethod = StateField ;
 ]
 
+SID_FM_CTL_PROPERTIES
+[
+ExecMethod = Execute ;
+StateMethod = GetState ;
+]
+
 }  // end of interface text
 
diff --git a/sw/source/uibase/shells/textsh1.cxx 
b/sw/source/uibase/shells/textsh1.cxx
index fd759463b971..270fcabc08dc 100644
--- a/sw/source/uibase/shells/textsh1.cxx
+++ b/sw/source/uibase/shells/textsh1.cxx
@@ -119,6 +119,8 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 
 using namespace ::com::sun::star;
 using namespace com::sun::star::beans;
@@ -1367,6 +1369,32 @@ void SwTextShell::Execute(SfxRequest &rReq)
 GetView().UpdateWordCount(this, nSlot);
 }
 break;
+case SID_FM_CTL_PROPERTIES:
+{
+SwPosition aPos(*GetShell().GetCursor()->GetPoint());
+sw::mark::IFieldmark* pFieldBM = 
GetShell().getIDocumentMarkAccess()->getFieldmarkFor(aPos);
+if ( !pFieldBM )
+{
+--aPos.nContent;
+pFieldBM = 
GetShell().getIDocumentMarkAccess()->getFieldmarkFor(aPos);
+}
+
+if ( pFieldBM && pFieldBM->GetFieldname() == ODF_FORMDROPDOWN )
+{
+SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
+ScopedVclPtr 
pDlg(pFact->CreateDropDownFormFieldDialog(rWrtSh.GetView().GetFrameWeld(), 
pFieldBM));
+pDlg->Execute();
+pFieldBM->Invalidate();
+rWrtSh.InvalidateWindows( rWrtSh.GetView().GetVisArea() );
+}
+else
+{
+SfxRequest aReq( GetView().GetViewFrame(), SID_FM_CTL_PROPERTIES );
+aReq.AppendItem( SfxBoolItem( SID_FM_CTL_PROPERTIES, true ) );
+rWrtSh.GetView().GetFormShell()->Execute( aReq );
+}
+}
+break;
 default:
 OSL_ENSURE(false, "wrong dispatcher");
 return;
@@ -1906,6 +1934,37 @@ void SwTextShell::GetState( SfxItemSet &rSet )
 rSet.DisableItem(nWhich);
 }
 break;
+case SID_FM_CTL_PROPERTIES:
+   

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

[Libreoffice Gerrit user]

 onlineupdate/source/update/updater/updater.cxx |   15 ++-
 1 file changed, 10 insertions(+), 5 deletions(-)

New commits:
commit eaabda554c7ac5ec814f7eefdb1a57719e590e92
Author: Markus Mohrhard 
AuthorDate: Fri Feb 15 16:37:58 2019 +0100
Commit: Markus Mohrhard 
CommitDate: Fri Feb 15 18:19:53 2019 +0100

work around Werror=format-truncation in onlineupdate for now

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

diff --git a/onlineupdate/source/update/updater/updater.cxx 
b/onlineupdate/source/update/updater/updater.cxx
index 3cd4aa890aa0..1166501f575e 100644
--- a/onlineupdate/source/update/updater/updater.cxx
+++ b/onlineupdate/source/update/updater/updater.cxx
@@ -1604,8 +1604,9 @@ PatchFile::Prepare()
 // extract the patch to a temporary file
 mPatchIndex = sPatchIndex++;
 
-NS_tsnprintf(spath, sizeof(spath)/sizeof(spath[0]),
+int nWrittenBytes = NS_tsnprintf(spath, sizeof(spath)/sizeof(spath[0]),
  NS_T("%s/updating/%d.patch"), gWorkingDirPath, mPatchIndex);
+(void) nWrittenBytes;
 
 NS_tremove(spath);
 
@@ -2491,8 +2492,9 @@ ProcessReplaceRequest()
 // need to have the last-update.log and backup-update.log files moved from 
the
 // old installation directory to the new installation directory.
 NS_tchar tmpLog[MAXPATHLEN];
-NS_tsnprintf(tmpLog, sizeof(tmpLog)/sizeof(tmpLog[0]),
+int nWrittenBytes = NS_tsnprintf(tmpLog, sizeof(tmpLog)/sizeof(tmpLog[0]),
  NS_T("%s/updates/last-update.log"), tmpDir);
+(void) nWrittenBytes;
 if (!NS_taccess(tmpLog, F_OK))
 {
 NS_tchar destLog[MAXPATHLEN];
@@ -2672,7 +2674,7 @@ CheckSignature(ArchiveReader& archiveReader)
 
 // TODO: moggi: needs adaption for LibreOffice
 // These paths need to be adapted for us.
-NS_tsnprintf(updateSettingsPath,
+int nWrittenBytes = NS_tsnprintf(updateSettingsPath,
  sizeof(updateSettingsPath) / 
sizeof(updateSettingsPath[0]),
 #ifdef MACOSX
  NS_T("%s/Contents/Resources/update-settings.ini"),
@@ -2680,6 +2682,7 @@ CheckSignature(ArchiveReader& archiveReader)
  NS_T("%s/update-settings.ini"),
 #endif
  gWorkingDirPath);
+(void) nWrittenBytes;
 MARChannelStringTable MARStrings;
 if (ReadMARChannelIDs(updateSettingsPath, &MARStrings) != OK)
 {
@@ -2743,8 +2746,9 @@ UpdateThreadFunc(void * /*param*/)
 rv = DoUpdate(archiveReader);
 }
 NS_tchar updatingDir[MAXPATHLEN];
-NS_tsnprintf(updatingDir, 
sizeof(updatingDir)/sizeof(updatingDir[0]),
+int nWrittenBytes = NS_tsnprintf(updatingDir, 
sizeof(updatingDir)/sizeof(updatingDir[0]),
  NS_T("%s/updating"), gWorkingDirPath);
+(void) nWrittenBytes;
 ensure_remove_recursive(updatingDir);
 }
 }
@@ -4452,8 +4456,9 @@ int AddPreCompleteActions(ActionList *list)
 int DoUpdate(ArchiveReader& archiveReader)
 {
 NS_tchar manifest[MAXPATHLEN];
-NS_tsnprintf(manifest, sizeof(manifest)/sizeof(manifest[0]),
+int nWrittenBytes = NS_tsnprintf(manifest, 
sizeof(manifest)/sizeof(manifest[0]),
  NS_T("%s/updating/update.manifest"), gWorkingDirPath);
+(void) nWrittenBytes;
 ensure_parent_dir(manifest);
 
 // extract the manifest
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/msforms' - 365 commits - accessibility/inc accessibility/source apple_remote/source avmedia/source basctl/inc basctl/source basctl/uiconfig basegfx/sour

[Libreoffice Gerrit user]

Rebased ref, commits from common ancestor:
commit 0815e9243a3900cbff3677d33583c383ccf8ca41
Author: Tamás Zolnai 
AuthorDate: Fri Feb 15 17:50:18 2019 +0100
Commit: Tamás Zolnai 
CommitDate: Fri Feb 15 17:50:18 2019 +0100

MSForms: Rework the MS compatible Forms menu a bit

* DateField is saved as a content control in MSO file formats
so let have it under content controls submenu
* The MS compatible forms menu is a Writer specific thing so better
to have the related commands as Writer commands.

Change-Id: I2d66130f54c055a422f56b18ff2c98667e4f6469

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 5e8709ba4938..ccaed35731b0 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -6833,16 +6833,6 @@
   More Fields
 
   
-  
-
-  ActiveX Controls
-
-  
-  
-
-  Legacy Forms
-
-  
 
   
 
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index cc136f04a7c6..e88f44c8e6ce 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -3402,6 +3402,21 @@
   1
 
   
+  
+
+  ActiveX Controls
+
+  
+  
+
+  Legacy Form Fields
+
+  
+  
+
+  Content Controls
+
+  
 
   
 
diff --git a/sw/uiconfig/swriter/menubar/mscompatibleformsmenu.xml 
b/sw/uiconfig/swriter/menubar/mscompatibleformsmenu.xml
index 4c8e34467d3e..4d157908dd71 100644
--- a/sw/uiconfig/swriter/menubar/mscompatibleformsmenu.xml
+++ b/sw/uiconfig/swriter/menubar/mscompatibleformsmenu.xml
@@ -21,7 +21,6 @@
   
   
   
-  
 
   
   
@@ -31,6 +30,11 @@
   
 
   
+  
+
+  
+
+  
 
   
 
commit 1d1cd6cd5396b230994044271db06eaaf8889a10
Author: Tamás Zolnai 
AuthorDate: Fri Feb 15 14:11:37 2019 +0100
Commit: Tamás Zolnai 
CommitDate: Fri Feb 15 14:12:32 2019 +0100

MSForms: Make Control Properties menu to work with drop-down form field

Always forward the Execute and State method to the form shell,
so if a form control is selected the Control Properites will
work correctly.
Otherwise we check whether there is any field next to the cursor.

Change-Id: I25055c17d887a2f2a716d8325f46825cc408179e

diff --git a/sw/sdi/_textsh.sdi b/sw/sdi/_textsh.sdi
index f8c2daee6d65..3724ee041ecc 100644
--- a/sw/sdi/_textsh.sdi
+++ b/sw/sdi/_textsh.sdi
@@ -1694,5 +1694,11 @@ interface BaseText
 StateMethod = StateField ;
 ]
 
+SID_FM_CTL_PROPERTIES
+[
+ExecMethod = Execute ;
+StateMethod = GetState ;
+]
+
 }  // end of interface text
 
diff --git a/sw/source/uibase/shells/textsh1.cxx 
b/sw/source/uibase/shells/textsh1.cxx
index fd759463b971..270fcabc08dc 100644
--- a/sw/source/uibase/shells/textsh1.cxx
+++ b/sw/source/uibase/shells/textsh1.cxx
@@ -119,6 +119,8 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 
 using namespace ::com::sun::star;
 using namespace com::sun::star::beans;
@@ -1367,6 +1369,32 @@ void SwTextShell::Execute(SfxRequest &rReq)
 GetView().UpdateWordCount(this, nSlot);
 }
 break;
+case SID_FM_CTL_PROPERTIES:
+{
+SwPosition aPos(*GetShell().GetCursor()->GetPoint());
+sw::mark::IFieldmark* pFieldBM = 
GetShell().getIDocumentMarkAccess()->getFieldmarkFor(aPos);
+if ( !pFieldBM )
+{
+--aPos.nContent;
+pFieldBM = 
GetShell().getIDocumentMarkAccess()->getFieldmarkFor(aPos);
+}
+
+if ( pFieldBM && pFieldBM->GetFieldname() == ODF_FORMDROPDOWN )
+{
+SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
+ScopedVclPtr 
pDlg(pFact->CreateDropDownFormFieldDialog(rWrtSh.GetView().GetFrameWeld(), 
pFieldBM));
+pDlg->Execute();
+pFieldBM->Invalidate();
+rWrtSh.InvalidateWindows( rWrtSh.GetView().GetVisArea() );
+}
+else
+{
+SfxRequest aReq( GetView().GetViewFrame(), SID_FM_CTL_PROPERTIES );
+aReq.AppendItem( SfxBoolItem( SID_FM_CTL_PROPERTIES, true ) );
+rWrtSh.GetView().GetFormShell()->Execute( aReq );
+}
+}
+break;
 default:
 OSL_ENSURE(false, "wrong dispatcher");
 return;
@@ -1906,6 +1934,37 @@ void SwTextShell::GetState( SfxItemSet &rSet )
 rSet.DisableItem(nWhich);
 }
 break;
+case SID_FM_CTL_PROPERTIES:
+   

[Libreoffice-commits] online.git: android/app

[Libreoffice Gerrit user]

 android/app/src/main/java/org/libreoffice/androidapp/MainActivity.java |   11 
-
 android/app/src/main/res/layout/activity_main.xml  |   20 
+-
 2 files changed, 3 insertions(+), 28 deletions(-)

New commits:
commit 5a3a90c5ec82e1e82df6fee6d21d0b14c18f6821
Author: Gülşah Köse 
AuthorDate: Thu Feb 14 13:21:00 2019 +0300
Commit: Jan Holesovsky 
CommitDate: Fri Feb 15 17:48:14 2019 +0100

Remove unnecessary button from ui and make webview fullscreen.

Change-Id: Ia07dc38b9394b0ae174ec112d828b858990488c3
Signed-off-by: Gülşah Köse 
Reviewed-on: https://gerrit.libreoffice.org/67815
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git 
a/android/app/src/main/java/org/libreoffice/androidapp/MainActivity.java 
b/android/app/src/main/java/org/libreoffice/androidapp/MainActivity.java
index bbf038b6f..87047f17d 100644
--- a/android/app/src/main/java/org/libreoffice/androidapp/MainActivity.java
+++ b/android/app/src/main/java/org/libreoffice/androidapp/MainActivity.java
@@ -137,16 +137,7 @@ public class MainActivity extends AppCompatActivity {
 urlToLoad +
 "&closebutton=1&permission=edit" +
 "&debug=true"); // TODO remove later?
-
-Button jsButton = findViewById(R.id.js_button);
-jsButton.setOnClickListener(new View.OnClickListener() {
-@Override
-public void onClick(View v) {
-
browser.loadUrl("javascript:helloFromJavascript()");
-}
-}
-);
-}
+}
 
 @Override
 protected void onResume() {
diff --git a/android/app/src/main/res/layout/activity_main.xml 
b/android/app/src/main/res/layout/activity_main.xml
index 5ae664ca6..244e1bb99 100644
--- a/android/app/src/main/res/layout/activity_main.xml
+++ b/android/app/src/main/res/layout/activity_main.xml
@@ -9,24 +9,8 @@
 
-
-
+tools:layout_editor_absoluteY="-6dp" />
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: android/app

[Libreoffice Gerrit user]

 android/app/src/main/AndroidManifest.xml |   59 +++
 1 file changed, 59 insertions(+)

New commits:
commit 62e2d479213e2bf9d05a140234b8b138ab04d210
Author: Gülşah Köse 
AuthorDate: Thu Feb 14 14:55:05 2019 +0300
Commit: Jan Holesovsky 
CommitDate: Fri Feb 15 17:47:06 2019 +0100

Associate files with the android application.

Change-Id: I9a654ea1cac8523b9422e5c183a5127244efb25f
Signed-off-by: Gülşah Köse 
Reviewed-on: https://gerrit.libreoffice.org/67817
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git a/android/app/src/main/AndroidManifest.xml 
b/android/app/src/main/AndroidManifest.xml
index e7372732b..b2718a77e 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -13,6 +13,65 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: 8 commits - android/app android/.gitignore configure.ac kit/Kit.cpp

[Libreoffice Gerrit user]

 android/.gitignore |9 
 android/app/build.gradle   |  182 
++
 android/app/liboSettings.gradle.in |   19 +
 android/app/src/main/cpp/CMakeLists.txt.in |   52 
++
 android/app/src/main/cpp/androidapp.cpp|6 
 android/app/src/main/java/org/libreoffice/androidapp/MainActivity.java |  108 
+
 configure.ac   |1 
 kit/Kit.cpp|2 
 8 files changed, 373 insertions(+), 6 deletions(-)

New commits:
commit 427c5ea219d43cb45369038defc8e17f1092493f
Author: Jan Holesovsky 
AuthorDate: Fri Feb 15 16:19:46 2019 +0100
Commit: Jan Holesovsky 
CommitDate: Fri Feb 15 16:53:35 2019 +0100

android: Settings for the build.gradle.

Change-Id: I457a7fb8a80106c0474ee03229e712a557cf799b

diff --git a/android/.gitignore b/android/.gitignore
index 34f7d7552..290fd83d8 100644
--- a/android/.gitignore
+++ b/android/.gitignore
@@ -3,4 +3,12 @@
 /android.iml
 /gradle
 /local.properties
+/app/src/main/assets/etc/
+/app/src/main/assets/example.odt
+/app/src/main/assets/license.txt
+/app/src/main/assets/notice.txt
+/app/src/main/assets/program/
+/app/src/main/assets/share/
+/app/src/main/assets/unpack/
+/app/src/main/assets/user/
 /app/src/main/cpp/lib
diff --git a/android/app/liboSettings.gradle.in 
b/android/app/liboSettings.gradle.in
new file mode 100644
index 0..325b9b933
--- /dev/null
+++ b/android/app/liboSettings.gradle.in
@@ -0,0 +1,19 @@
+ext {
+liboSrcRoot = '@LOBUILDDIR@'
+liboWorkdir = '@LOBUILDDIR@/workdir'
+liboInstdir = '@LOBUILDDIR@/instdir'
+liboEtcFolder   = 'program'
+liboUreMiscFolder   = 'program'
+liboSharedResFolder = 'program/resource'
+liboUREJavaFolder   = 'program/classes'
+liboShareJavaFolder = 'program/classes'
+liboExampleDocument = '@LOBUILDDIR@/android/default-document/example.odt'
+liboVersionMajor= '@LOOLWSD_VERSION_MAJOR@'
+liboVersionMinor= '@LOOLWSD_VERSION_MAJOR@'
+liboGitFullCommit   = '@LOOLWSD_VERSION_HASH@'
+}
+android.defaultConfig {
+applicationId 'org.libreoffice.androidapp'
+//versionCode project.hasProperty('cmdVersionCode') ? 
cmdVersionCode.toInteger() : 1
+versionName '@LOOLWSD_VERSION@'
+}
diff --git a/configure.ac b/configure.ac
index 34db534e8..b5dfc2ca6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -687,6 +687,7 @@ AS_IF([test "$ENABLE_IOSAPP" = "true"],
 AC_SUBST(IOSAPP_FONTS)
 
 AC_CONFIG_FILES([Makefile
+ android/app/liboSettings.gradle
  android/app/src/main/cpp/CMakeLists.txt
  gtk/Makefile
  ios/config.h
commit a362bdec096c2f76c5c8c494829c7a62cacb066a
Author: Jan Holesovsky 
AuthorDate: Fri Feb 15 16:09:57 2019 +0100
Commit: Jan Holesovsky 
CommitDate: Fri Feb 15 16:53:35 2019 +0100

android: Some pieces have to be unpacked out of the APK.

Mostly copied from the core.git.

Change-Id: I87472037c48d69a904440fd8008b515d604bb84b

diff --git a/android/app/build.gradle b/android/app/build.gradle
index af66460e5..e9728cfcc 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -57,7 +57,7 @@ dependencies {
 
 task copyUnpackAssets(type: Copy) {
 description "copies assets that need to be extracted on the device"
-into 'src/main/assets'
+into 'src/main/assets/unpack'
 into('program') {
 from("${liboInstdir}/${liboEtcFolder}/types") {
 includes = [
@@ -164,7 +164,7 @@ task createStrippedConfigRegistry(type: Exec) {
 task createRCfiles {
 inputs.file "liboSettings.gradle"
 dependsOn copyUnpackAssets, copyAssets
-def sofficerc = file('src/main/assets/program/sofficerc')
+def sofficerc = file('src/main/assets/unpack/program/sofficerc')
 def fundamentalrc = file('src/main/assets/program/fundamentalrc')
 def bootstraprc   = file('src/main/assets/program/bootstraprc')
 def unorc = file('src/main/assets/program/unorc')
@@ -219,7 +219,3 @@ preBuild.dependsOn 'createRCfiles',
 'createStrippedConfigMain',
 'createStrippedConfigRegistry',
 'createFullConfig'
-
-//clean.dependsOn 'cleanCopyAssets',
-//'cleanCreateStrippedConfig',
-//'cleanCreateFullConfig'
diff --git 
a/android/app/src/main/java/org/libreoffice/androidapp/MainActivity.java 
b/android/app/src/main/java/org/libreoffice/androidapp/MainActivity.java
index 5063972c1..bbf038b6f 100644
--- a/android/app/src/main/java/org/libreoffice/androidapp/MainActivity.java
+++ b/android/app/src/main/java/org/libreoffice/androidapp/MainActivity.java
@@ -9,9 +9,11 @@
 
 package org.libreoffice.androidapp;
 
+import android.content.SharedPreferences;
 import android.content.pm.App

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

[Libreoffice Gerrit user]

 desktop/source/lib/init.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 6b13784a140c4269f2caaceec3aec2e0bece45e9
Author: Tor Lillqvist 
AuthorDate: Fri Feb 15 17:47:47 2019 +0200
Commit: Tor Lillqvist 
CommitDate: Fri Feb 15 17:48:12 2019 +0200

Mention that temporaryHackToInvokeCallbackHandlers() is for LibreOfficeLight

Change-Id: I0b53fea8df48bea17c56678d6d9b7d43c571d0a1

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 6135ebdea78a..a7e1161a1bde 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -4625,6 +4625,9 @@ static void lo_destroy(LibreOfficeKit* pThis)
 }
 
 #ifdef IOS
+
+// Used by the unmaintained LibreOfficeLight app. Once that has been retired, 
get rid of this, too.
+
 extern "C"
 {
 __attribute__((visibility("default")))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: no source code in https://repo1.maven.org/maven2/org/libreoffice/unoil/5.4.2/

[Stephan Bergmann via LibreOffice]

On 15/02/2019 14:14, LORENZO Vincent wrote:

So, there is no real jar source for it, only idl files. Right ?


Right; unoil.jar contains Java classes representing the UNOIDL entities 
in LO's module offapi.  For historical reasons, the conversion from 
UNOIDL entities to Java classes (with LO's javamaker tool) is done 
directly to Java byte code, instead of to Java source code first.


(Similarly, LO's ridl.jar is a combination of classes compiled from 
ridljar/com/ *.java sources and generated from udkapi/com/ *.idl files.)


So, I would try to provide these idl files to Eclipse. Please could you 
confirm me that all contents of unoil.jar comes from the offapi folder 
of the git http://anongit.freedesktop.org/git/libreoffice/core.git .


Yes (I can confirm at least for unoil.jar as included in LO; see below 
for my ignorance of Maven).
Do you know which branch I must use to get the idl file used to generate 
unoil-5.4.2 ?


I have no idea who uploaded what to Maven, but I would guess that the 
"5.4.2" there corresponds to LO version 5.4.2, i.e., what got tagged 
with 
 
(i.e., the latest libreoffice-5.4.2.x tag, denoting the final release 
rather than a release candidate towards the final release.)

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

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - apple_remote/AppleRemote.m apple_remote/GlobalKeyboardDevice.m apple_remote/HIDRemoteControlDevice.m apple_remote/KeyspanFrontRowControl.m apple_re

[Libreoffice Gerrit user]

 Module_ooo.mk   |1 
 apple_remote/Library_AppleRemote.mk |   56 ++
 apple_remote/Makefile   |   32 +++
 apple_remote/Module_apple_remote.mk |   33 +++
 apple_remote/Package_inc.mk |   33 +++
 apple_remote/makefile.mk|   76 
 apple_remote/prj/build.lst  |2 
 apple_remote/prj/d.lst  |5 --
 apple_remote/prj/makefile.mk|   44 
 9 files changed, 200 insertions(+), 82 deletions(-)

New commits:
commit 1e83a495f196e604418c4300817f66bc9bd7f2c1
Author: Damjan Jovanovic 
AuthorDate: Fri Feb 15 13:09:06 2019 +
Commit: Damjan Jovanovic 
CommitDate: Fri Feb 15 13:09:06 2019 +

Port main/apple_remote to gbuild.

Not tested, since we don't have a Mac buildbot, and I don't have a Mac.

Patch by: me

diff --git a/Module_ooo.mk b/Module_ooo.mk
index 00a1125ab419..6adeea125a71 100644
--- a/Module_ooo.mk
+++ b/Module_ooo.mk
@@ -28,6 +28,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
 UnoControls \
 accessibility \
 animations \
+apple_remote \
 autodoc \
 automation \
 avmedia \
diff --git a/apple_remote/Library_AppleRemote.mk 
b/apple_remote/Library_AppleRemote.mk
new file mode 100644
index ..8c7aedd2679e
--- /dev/null
+++ b/apple_remote/Library_AppleRemote.mk
@@ -0,0 +1,56 @@
+#**
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+#**
+
+
+
+$(eval $(call gb_Library_Library,AppleRemote))
+
+$(eval $(call gb_Library_add_package_headers,AppleRemote,apple_remote_inc))
+
+$(eval $(call gb_Library_set_include,AppleRemote,\
+   $$(INCLUDE) \
+   -I$(SRCDIR)/apple_remote/inc \
+   -I$(OUTDIR)/inc \
+))
+
+$(eval $(call gb_Library_add_linked_libs,AppleRemote,\
+   stl \
+   $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_libs,AppleRemote,\
+   -framework Cocoa \
+   -framework Carbon \
+   -framework IOKit \
+))
+
+$(eval $(call gb_Library_add_objcxxobjects,AppleRemote,\
+   apple_remote/source/AppleRemote \
+   apple_remote/source/RemoteControl \
+   apple_remote/source/RemoteControlContainer \
+   apple_remote/source/GlobalKeyboardDevice \
+   apple_remote/source/HIDRemoteControlDevice \
+   apple_remote/source/MultiClickRemoteBehavior \
+   apple_remote/source/RemoteMainController \
+))
+
+# vim: set noet sw=4 ts=4:
+
diff --git a/apple_remote/Makefile b/apple_remote/Makefile
new file mode 100644
index ..c1d144cbd4c9
--- /dev/null
+++ b/apple_remote/Makefile
@@ -0,0 +1,32 @@
+#**
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+#**
+
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
+
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
+
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath 
$(firstword $(MAKEFILE_LIST/Module*.mk)))
+
+# vim: set noet sw=4 ts=4:
diff --git a/apple_remote/Module_apple_remote.mk 
b/apple_remote/Module_apple_remote.mk
new file mode 100644
index ..415a1f156ab6
--- /dev/null
+++ b/apple_remote

[Libreoffice-commits] help.git: Branch 'libreoffice-6-2-1' - CustomTarget_html.mk

[Libreoffice Gerrit user]

 CustomTarget_html.mk |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 8339ecf401eb80f1d501d9d5d9e6de10908773cd
Author: Stephan Bergmann 
AuthorDate: Fri Feb 15 10:14:37 2019 +0100
Commit: Xisco Faulí 
CommitDate: Fri Feb 15 14:18:37 2019 +0100

tdf#121532 Don't use non-standard `echo -n`

At least the version of echo used to build TDF's LO 6.2.0.3 release 
apparently
doesn't understand that non-standard option and printed out "-n" verbatim,
generating a broken languages.js.  (Though my local macOS 10.14.3 /bin/echo 
does
understand that option.)

Change-Id: I7233fa5c6e7851c5086c428a67aaee71604061e1
Reviewed-on: https://gerrit.libreoffice.org/67858
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 
(cherry picked from commit 8986dec8229cf31ccfadb61e6e90c905f7033ac7)
Reviewed-on: https://gerrit.libreoffice.org/67860
Reviewed-by: Xisco Faulí 

diff --git a/CustomTarget_html.mk b/CustomTarget_html.mk
index 7c5a9ddc8..b3c9b4e69 100644
--- a/CustomTarget_html.mk
+++ b/CustomTarget_html.mk
@@ -52,9 +52,9 @@ $(call 
gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/hid2file.js : \
 $(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/languages.js : \
$(SRCDIR)/helpcontent2/CustomTarget_html.mk
( \
-   echo -n 'var languagesSet = new Set([' ; \
-   for lang in $(gb_HELP_LANGS) ; do echo -n "'$$lang', " ; done | 
sed 's/, $$//' ; \
-   echo ']);' \
+   printf 'var languagesSet = new Set([' ; \
+   for lang in $(gb_HELP_LANGS) ; do printf '%s' "'$$lang', " ; 
done | sed 's/, $$//' ; \
+   printf ']);\n' \
) > $@
 
 define html_gen_langnames_js_dep
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/svtools include/vcl sc/inc sc/source sc/uiconfig solenv/sanitizers svtools/source svtools/uiconfig svtools/UIConfig_svt.mk vcl/source vcl/unx

[Libreoffice Gerrit user]

 include/svtools/ctrlbox.hxx  |   24 ++
 include/vcl/calendar.hxx |3 
 include/vcl/weld.hxx |   20 ++
 sc/inc/scabstdlg.hxx |8 
 sc/source/ui/attrdlg/scdlgfact.cxx   |   14 -
 sc/source/ui/attrdlg/scdlgfact.hxx   |   17 +
 sc/source/ui/dbgui/dpgroupdlg.cxx|  268 ---
 sc/source/ui/inc/dpgroupdlg.hxx  |  103 ---
 sc/source/ui/inc/editfield.hxx   |2 
 sc/source/ui/view/cellsh1.cxx|2 
 sc/uiconfig/scalc/ui/groupbydate.ui  |  108 +++-
 solenv/sanitizers/ui/modules/scalc.suppr |5 
 svtools/UIConfig_svt.mk  |1 
 svtools/source/control/ctrlbox.cxx   |   33 +++
 svtools/uiconfig/ui/datewindow.ui|   32 +++
 vcl/source/app/salvtables.cxx|   55 ++
 vcl/source/control/calendar.cxx  |   18 ++
 vcl/unx/gtk3/gtk3gtkinst.cxx |   90 ++
 18 files changed, 546 insertions(+), 257 deletions(-)

New commits:
commit 03b4d8f486d9ecdfe21a05d6bf65c396a35772f6
Author: Caolán McNamara 
AuthorDate: Thu Feb 14 21:26:27 2019 +
Commit: Caolán McNamara 
CommitDate: Fri Feb 15 15:11:58 2019 +0100

weld ScDPDateGroupDlg

adding a weld::Calendar and a pretty menubutton to access it, sidestepping 
the
difficulty of abusing a spinbutton to select a date. The prettiness is 
wasted
on this hard to find obscure dialog

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

diff --git a/include/svtools/ctrlbox.hxx b/include/svtools/ctrlbox.hxx
index eea2e0a51023..c8ea9320c504 100644
--- a/include/svtools/ctrlbox.hxx
+++ b/include/svtools/ctrlbox.hxx
@@ -308,6 +308,30 @@ private:
 Link maSelectHdl;
 };
 
+class SVT_DLLPUBLIC SvtCalendarBox
+{
+public:
+SvtCalendarBox(std::unique_ptr pControl);
+~SvtCalendarBox();
+
+weld::MenuButton& get_button() { return *m_xControl; }
+
+void set_date(const Date& rDate);
+Date get_date() const { return m_xCalendar->get_date(); }
+
+void set_sensitive(bool bSensitive) { 
m_xControl->set_sensitive(bSensitive); }
+bool get_sensitive() const { return m_xControl->get_sensitive(); }
+void grab_focus() { m_xControl->grab_focus(); }
+private:
+DECL_LINK(SelectHdl, weld::Calendar&, void);
+DECL_LINK(ActivateHdl, weld::Calendar&, void);
+
+std::unique_ptr m_xControl;
+std::unique_ptr m_xBuilder;
+std::unique_ptr m_xTopLevel;
+std::unique_ptr m_xCalendar;
+};
+
 class SVT_DLLPUBLIC FontNameBox : public ComboBox
 {
 private:
diff --git a/include/vcl/calendar.hxx b/include/vcl/calendar.hxx
index 575af0101c9e..fe4f7ea7c0eb 100644
--- a/include/vcl/calendar.hxx
+++ b/include/vcl/calendar.hxx
@@ -165,6 +165,7 @@ class VCL_DLLPUBLIC Calendar final : public Control
 mbTravelSelect:1,
 mbAllSel:1;
 Link   maSelectHdl;
+Link   maActivateHdl;
 
 using Control::ImplInitSettings;
 using Window::ImplInit;
@@ -193,6 +194,7 @@ class VCL_DLLPUBLIC Calendar final : public Control
 VCL_DLLPRIVATE void ImplEndTracking( bool bCancel );
 VCL_DLLPRIVATE DayOfWeekImplGetWeekStart() const;
 
+virtual Size GetOptimalSize() const override;
 public:
 Calendar( vcl::Window* pParent, WinBits nWinStyle );
 virtual ~Calendar() override;
@@ -235,6 +237,7 @@ public:
 SizeCalcWindowSizePixel() const;
 
 voidSetSelectHdl( const Link& rLink ) { 
maSelectHdl = rLink; }
+voidSetActivateHdl( const Link& rLink ) { 
maActivateHdl = rLink; }
 };
 
 #endif // INCLUDED_VCL_CALENDAR_HXX
diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx
index 7a88c60189bf..868a444dcf87 100644
--- a/include/vcl/weld.hxx
+++ b/include/vcl/weld.hxx
@@ -12,6 +12,7 @@
 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -942,6 +943,23 @@ public:
 virtual void set_from_icon_name(const OUString& rIconName) = 0;
 };
 
+class VCL_DLLPUBLIC Calendar : virtual public Widget
+{
+protected:
+Link m_aSelectedHdl;
+Link m_aActivatedHdl;
+
+void signal_selected() { m_aSelectedHdl.Call(*this); }
+void signal_activated() { m_aActivatedHdl.Call(*this); }
+
+public:
+void connect_selected(const Link& rLink) { m_aSelectedHdl 
= rLink; }
+void connect_activated(const Link& rLink) { 
m_aActivatedHdl = rLink; }
+
+virtual void set_date(const Date& rDate) = 0;
+virtual Date get_date() const = 0;
+};
+
 // an entry + treeview pair, where the entry autocompletes from the
 // treeview list, and selecting something in the list sets the
 // entry to that text, i.e. a visually exploded ComboBox
@@ -1472,6 +1490,8 @@ public:
bool bTakeOwnership 
= false)

[Libreoffice-commits] online.git: test/Makefile.am test/TileCacheTests.cpp wsd/DocumentBroker.cpp wsd/TileCache.cpp wsd/TileCache.hpp

[Libreoffice Gerrit user]

 test/Makefile.am|1 
 test/TileCacheTests.cpp |2 
 wsd/DocumentBroker.cpp  |   16 ++--
 wsd/TileCache.cpp   |  187 +++-
 wsd/TileCache.hpp   |   23 ++---
 5 files changed, 82 insertions(+), 147 deletions(-)

New commits:
commit 66ac62429c67a4fadca4f5481c76bdbb98361f0a
Author: Michael Meeks 
AuthorDate: Thu Feb 14 22:40:33 2019 +0100
Commit: Michael Meeks 
CommitDate: Fri Feb 15 12:10:16 2019 +0100

TileCache: switch to in-memory, rather than persistent.

Remove significant complexity; if we need it later lets do it more simply
serializing when we start / finish a session.

Turn off caching for mobile - possibly should kill for single-user too.

Change-Id: I5ea56088ddbb61f22fe7920f8c9ac7440cb3296a

diff --git a/test/Makefile.am b/test/Makefile.am
index 7af9b467b..2683bce16 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -122,6 +122,7 @@ check-local:
./run_unit.sh --log-file test.log --trs-file test.trs
 # FIXME 2: unit-oob.la fails with symbol undefined:
 # UnitWSD::testHandleRequest(UnitWSD::TestRequest, UnitHTTPServerRequest&, 
UnitHTTPServerResponse&) ,
+
 TESTS = unit-typing.la unit-convert.la unit-prefork.la unit-tilecache.la \
unit-timeout.la unit-oauth.la unit-wopi.la unit-wopi-saveas.la \
 unit-wopi-ownertermination.la unit-wopi-versionrestore.la \
diff --git a/test/TileCacheTests.cpp b/test/TileCacheTests.cpp
index 982d0351c..c02989dee 100644
--- a/test/TileCacheTests.cpp
+++ b/test/TileCacheTests.cpp
@@ -183,7 +183,7 @@ void TileCacheTests::testSimple()
 
 // Create TileCache and pretend the file was modified as recently as
 // now, so it discards the cached data.
-TileCache tc("doc.ods", Poco::Timestamp(), "/tmp/tile_cache_tests", true);
+TileCache tc("doc.ods", Poco::Timestamp());
 
 int part = 0;
 int width = 256;
diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
index 3cce77e62..01a78b9b8 100644
--- a/wsd/DocumentBroker.cpp
+++ b/wsd/DocumentBroker.cpp
@@ -391,9 +391,8 @@ void DocumentBroker::pollThread()
 LOOLWSD::doHousekeeping();
 #endif
 
-// Remove all tiles related to this document from the cache if configured 
so.
-if (_tileCache && !LOOLWSD::TileCachePersistent)
-_tileCache->completeCleanup();
+if (_tileCache)
+_tileCache->clear();
 
 LOG_INF("Finished docBroker polling thread for docKey [" << _docKey << 
"].");
 }
@@ -727,7 +726,15 @@ bool DocumentBroker::load(const 
std::shared_ptr& session, const s
 
 // Use the local temp file's timestamp.
 _lastFileModifiedTime = 
Poco::File(_storage->getRootFilePath()).getLastModified();
-_tileCache.reset(new TileCache(_storage->getUriString(), 
_lastFileModifiedTime, _cacheRoot, LOOLWSD::TileCachePersistent));
+
+bool dontUseCache = false;
+#if MOBILEAPP
+// avoid memory consumption for single-user local bits.
+// FIXME: arguably should/could do this for single user documents too.
+dontUseCache = true;
+#endif
+
+_tileCache.reset(new TileCache(_storage->getUriString(), 
_lastFileModifiedTime, dontUseCache));
 _tileCache->setThreadOwner(std::this_thread::get_id());
 }
 
@@ -856,7 +863,6 @@ bool DocumentBroker::saveToStorageInternal(const 
std::string& sessionId,
 // Saved and stored; update flags.
 setModified(false);
 _lastFileModifiedTime = newFileModifiedTime;
-_tileCache->saveLastModified(_lastFileModifiedTime);
 _lastSaveTime = std::chrono::steady_clock::now();
 
 // Save the storage timestamp.
diff --git a/wsd/TileCache.cpp b/wsd/TileCache.cpp
index b709bde2c..e87fe9214 100644
--- a/wsd/TileCache.cpp
+++ b/wsd/TileCache.cpp
@@ -44,54 +44,18 @@ using Poco::File;
 using Poco::StringTokenizer;
 using Poco::Timestamp;
 
-namespace {
-TileCache::Tile loadTile(const std::string &fileName)
-{
-TileCache::Tile ret;
-
-std::unique_ptr result(new std::fstream(fileName, 
std::ios::in));
-if (result && result->is_open())
-{
-LOG_TRC("Found cache tile: " << fileName);
-
-result->seekg(0, std::ios_base::end);
-std::streamsize size = result->tellg();
-ret = std::make_shared>(size);
-result->seekg(0, std::ios_base::beg);
-result->read(ret->data(), size);
-result->close();
-}
-return ret;
-}
-}
-
 TileCache::TileCache(const std::string& docURL,
  const Timestamp& modifiedTime,
- const std::string& cacheDir,
- const bool tileCachePersistent) :
+ bool dontCache) :
 _docURL(docURL),
-_cacheDir(cacheDir),
-_tileCachePersistent(tileCachePersistent)
+_dontCache(dontCache)
 {
 #ifndef BUILDING_TESTS
 LOG_INF("TileCache ctor for uri [" << LOOLWSD::anonymizeUrl(_docURL) <<
-

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

[Libreoffice Gerrit user]

 compilerplugins/clang/indentation.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 177747c44557489760cc00473daecacd5427
Author: Stephan Bergmann 
AuthorDate: Fri Feb 15 12:13:18 2019 +0100
Commit: Tor Lillqvist 
CommitDate: Fri Feb 15 12:19:34 2019 +0100

SourceManager::getExpansionRange already returns CharSourceRange since 
Clang 7

Change-Id: Ic7c6c648c71203116ca074bd7392a48ff850cd51
Reviewed-on: https://gerrit.libreoffice.org/67864
Reviewed-by: Tor Lillqvist 
Tested-by: Tor Lillqvist 

diff --git a/compilerplugins/clang/indentation.cxx 
b/compilerplugins/clang/indentation.cxx
index 6b4e39c9d483..04a9be6677d0 100644
--- a/compilerplugins/clang/indentation.cxx
+++ b/compilerplugins/clang/indentation.cxx
@@ -114,7 +114,7 @@ bool Indentation::VisitCompoundStmt(CompoundStmt const* 
compoundStmt)
 // similar thing in forms/
 if (macroName == "DECL_IFACE_PROP_IMPL" || macroName == 
"DECL_BOOL_PROP_IMPL")
 continue;
-#if CLANG_VERSION >= 8
+#if CLANG_VERSION >= 7
 stmtLoc = SM.getExpansionRange(stmtLoc).getBegin();
 #else
 stmtLoc = SM.getExpansionRange(stmtLoc).first;
___
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-1' - helpcontent2

[Libreoffice Gerrit user]

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

New commits:
commit 740340ca579ead75bd833a225e1bffe874d21769
Author: Stephan Bergmann 
AuthorDate: Fri Feb 15 10:14:37 2019 +0100
Commit: Gerrit Code Review 
CommitDate: Fri Feb 15 14:18:37 2019 +0100

Update git submodules

* Update helpcontent2 from branch 'libreoffice-6-2-1'
  - tdf#121532 Don't use non-standard `echo -n`

At least the version of echo used to build TDF's LO 6.2.0.3 release 
apparently
doesn't understand that non-standard option and printed out "-n" 
verbatim,
generating a broken languages.js.  (Though my local macOS 10.14.3 
/bin/echo does
understand that option.)

Change-Id: I7233fa5c6e7851c5086c428a67aaee71604061e1
Reviewed-on: https://gerrit.libreoffice.org/67858
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 
(cherry picked from commit 8986dec8229cf31ccfadb61e6e90c905f7033ac7)
Reviewed-on: https://gerrit.libreoffice.org/67860
Reviewed-by: Xisco Faulí 

diff --git a/helpcontent2 b/helpcontent2
index e594ec154e5d..8339ecf401eb 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit e594ec154e5db0cdb774c3b961e1ffc56e094bfd
+Subproject commit 8339ecf401eb80f1d501d9d5d9e6de10908773cd
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/svtools include/vcl solenv/clang-format svtools/source vcl/inc vcl/Library_vcl.mk vcl/source

[Libreoffice Gerrit user]

 include/svtools/calendar.hxx|  202 
 include/svtools/strings.hrc |2 
 include/vcl/calendar.hxx|  242 +
 solenv/clang-format/blacklist   |2 
 svtools/source/control/calendar.cxx | 1506 --
 vcl/Library_vcl.mk  |1 
 vcl/inc/strings.hrc |4 
 vcl/source/control/calendar.cxx | 1550 
 vcl/source/window/builder.cxx   |6 
 9 files changed, 1806 insertions(+), 1709 deletions(-)

New commits:
commit 465939feb0e9c382e5581b53b72008979ece4807
Author: Caolán McNamara 
AuthorDate: Thu Feb 14 15:06:01 2019 +
Commit: Caolán McNamara 
CommitDate: Fri Feb 15 10:51:46 2019 +0100

move Calendar to vcl and map to GtkCalendar

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

diff --git a/include/svtools/calendar.hxx b/include/svtools/calendar.hxx
index cc5b62ba9e70..562b1e9de169 100644
--- a/include/svtools/calendar.hxx
+++ b/include/svtools/calendar.hxx
@@ -23,6 +23,7 @@
 #include 
 #include 
 
+#include 
 #include 
 #include 
 #include 
@@ -43,207 +44,6 @@ class Button;
 Description
 
 
-class Calendar
-
-This class allows for the selection of a date. The displayed date range is
-the one specified by the Date class. We display as many months as we have
-space in the control. The user can switch between months using a ContextMenu
-(clicking on the month's name) or via two ScrollButtons in-between the months.
-
---
-
-WinBits
-
-WB_BORDER   We draw a border around the window.
-WB_TABSTOP  Keyboard control is possible. We get the focus, 
when
-the user clicks in the Control.
-
---
-
-We set and get the selected date by SetCurDate()/GetCurDate().
-If the user selects a date Select() is called. If the user double clicks
-DoubleClick() is called.
-
---
-
-CalcWindowSizePixel() calculates the window size in pixel that is needed
-to display a certain number of months.
-
---
-
-SetSaturdayColor() and SetSundayColor() set a special color for Saturdays
-and Sundays.
-AddDateInfo() marks special days. With that we can set e.g. public holidays
-to another color or encircle them (for e.g. appointments).
-If we do not supply a year in the date, the day is used in EVERY year.
-
-AddDateInfo() can also add text for every date, which is displayed if the
-BalloonHelp is enabled.
-In order to not have to supply all years with the relevant data, we call
-the RequestDateInfo() handler if a new year is displayed. We can then query
-the year in the handler with GetRequestYear().
-
---
-
-In order to display a ContextMenu for a date, we need to override the
-Command handler. GetDate() can infer the date from the mouse's position.
-If we use the keyboard, the current date should be use.
-
-If a ContextMenu is displayed, the baseclass' handler must not be called.
-
---
-
-SetNoSelection() deselects everything.
-SetCurDate() does not select the current date, but only defines the focus
-rectangle.
-GetSelectDateCount()/GetSelectDate() query the selected range.
-IsDateSelected() queries for the status of a date.
-
-The SelectionChanging() handler is being called while a user selects a
-date. In it, we can change the selected range. E.g. if we want to limit
-or extend the selected range. The selected range is realised via SelectDate()
-and SelectDateRange() and queried with GetSelectDateCount()/GetSelectDate().
-
-IsSelectLeft() returns the direction of the selection:
-sal_True is a selection to the left or up
-sal_False is a selection to the right or down
-
---
-
-If the DateRange area changes and we want to take over the selection, we
-should only do this is if IsScrollDateRangeChanged() returns sal_True.
-This method returns sal_True if the area change was triggered by using the
-ScrollButtons and sal_False if it was triggered by Resize(), other method
-calls or by ending a selection.
-
-*/
-
-typedef std::set IntDateSet;
-
-
-class SVT_DLLPUBLIC Calendar final : public Control
-{
-std::unique_ptr mpSelectTable;
-std::unique_ptr mpOldSelectTable;
-OUStringmaDayTexts[31];
-OUStringmaDayText;
-OUStringmaWeekText;
-CalendarWrapper maCalendar

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

[Libreoffice Gerrit user]

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

New commits:
commit a65e4b9050bea3e15d6fd0bba0be3022404583e7
Author: Stephan Bergmann 
AuthorDate: Fri Feb 15 10:14:37 2019 +0100
Commit: Gerrit Code Review 
CommitDate: Fri Feb 15 14:19:27 2019 +0100

Update git submodules

* Update helpcontent2 from branch 'libreoffice-6-2'
  - tdf#121532 Don't use non-standard `echo -n`

At least the version of echo used to build TDF's LO 6.2.0.3 release 
apparently
doesn't understand that non-standard option and printed out "-n" 
verbatim,
generating a broken languages.js.  (Though my local macOS 10.14.3 
/bin/echo does
understand that option.)

Change-Id: I7233fa5c6e7851c5086c428a67aaee71604061e1
Reviewed-on: https://gerrit.libreoffice.org/67858
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 
(cherry picked from commit 8986dec8229cf31ccfadb61e6e90c905f7033ac7)
Reviewed-on: https://gerrit.libreoffice.org/67859
Tested-by: Xisco Faulí 
Reviewed-by: Xisco Faulí 

diff --git a/helpcontent2 b/helpcontent2
index ec2affa7289a..18e278f7c01a 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit ec2affa7289a7964f5291d5368dc31a1d2ae0961
+Subproject commit 18e278f7c01a22112d59d56e38794455e1166e41
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sw/qa/extras/ooxmlexport/ooxmlexport8.cxx|   12 ++-
 sw/source/filter/ww8/docxattributeoutput.cxx |   25 ++-
 writerfilter/source/dmapper/DomainMapperTableManager.cxx |   15 -
 3 files changed, 9 insertions(+), 43 deletions(-)

New commits:
commit 8fdbda18b593e7014e44a0fd590bbf98d83258b7
Author: Miklos Vajna 
AuthorDate: Fri Feb 15 14:06:15 2019 +0100
Commit: Miklos Vajna 
CommitDate: Fri Feb 15 15:05:07 2019 +0100

sw btlr writing mode: implement DOCX filter

Replace the old trick with character-level rotation with the usage of
the new writing direction.

This means that finally table cells with btlr text direction and
multiple paragraphs show all content, not only the first paragraph, as
before (seen as data loss by users).

Change-Id: I094f36fa6ba0701579e487e8e0212707987b1b2f
Reviewed-on: https://gerrit.libreoffice.org/67870
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins

diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx
index b42933eb3513..114f0a310570 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx
@@ -775,9 +775,8 @@ DECLARE_OOXMLEXPORT_TEST(testTbLrHeight, "tblr-height.docx")
 uno::Reference xTextTablesSupplier(mxComponent, 
uno::UNO_QUERY);
 uno::Reference 
xTables(xTextTablesSupplier->getTextTables(), uno::UNO_QUERY);
 uno::Reference xTable(xTables->getByIndex(0), 
uno::UNO_QUERY);
-uno::Reference xTableRows(xTable->getRows(), 
uno::UNO_QUERY);
-// btLr text direction was imported as MIN, it should be FIX to avoid 
incorrectly large height in case of too much content.
-CPPUNIT_ASSERT_EQUAL(text::SizeType::FIX, 
getProperty(xTableRows->getByIndex(0), "SizeType"));
+uno::Reference xCell = xTable->getCellByName("B1");
+CPPUNIT_ASSERT_EQUAL(text::WritingMode2::BT_LR, 
getProperty(xCell, "WritingMode"));
 }
 
 DECLARE_OOXMLEXPORT_TEST(testBnc865381, "bnc865381.docx")
@@ -785,11 +784,8 @@ DECLARE_OOXMLEXPORT_TEST(testBnc865381, "bnc865381.docx")
 uno::Reference xTablesSupplier(mxComponent, 
uno::UNO_QUERY);
 uno::Reference 
xTables(xTablesSupplier->getTextTables(), uno::UNO_QUERY);
 uno::Reference xTextTable(xTables->getByIndex(0), 
uno::UNO_QUERY);
-uno::Reference xTableRows(xTextTable->getRows(), 
uno::UNO_QUERY);
-// Second row has a vertically merged cell, make sure size type is not FIX 
in that case (otherwise B2 is not readable).
-CPPUNIT_ASSERT(text::SizeType::FIX != 
getProperty(xTableRows->getByIndex(1), "SizeType"));
-// Explicit size of 41 mm100 was set, so the vertical text in A2 was not 
readable.
-CPPUNIT_ASSERT_EQUAL(sal_Int32(0), 
getProperty(xTableRows->getByIndex(1), "Height"));
+uno::Reference xCell = xTextTable->getCellByName("A2");
+CPPUNIT_ASSERT_EQUAL(text::WritingMode2::BT_LR, 
getProperty(xCell, "WritingMode"));
 }
 
 DECLARE_OOXMLEXPORT_TEST(testFdo53985, "fdo53985.docx")
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 4fbfef4aa374..8e3b4af3303d 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -4192,28 +4192,11 @@ void DocxAttributeOutput::TableVerticalCell( 
ww8::WW8TableNodeInfoInner::Pointer
 m_pSerializer->singleElementNS( XML_w, XML_textDirection,
FSNS( XML_w, XML_val ), "tbRl",
FSEND );
-else if ( SvxFrameDirection::Horizontal_LR_TB == 
m_rExport.TrueFrameDirection( *pFrameFormat ) )
+else if ( SvxFrameDirection::Vertical_LR_BT == 
m_rExport.TrueFrameDirection( *pFrameFormat ) )
 {
-// Undo the text direction mangling done by the btLr handler in 
writerfilter::dmapper::DomainMapperTableManager::sprm()
-const SwStartNode* pSttNd = pTabBox->GetSttNd();
-if (pSttNd)
-{
-SwPaM aPam(*pSttNd, 0);
-++aPam.GetPoint()->nNode;
-if (aPam.GetPoint()->nNode.GetNode().IsTextNode())
-{
-const SwTextNode& rTextNode = static_cast(aPam.GetPoint()->nNode.GetNode());
-if( const SwAttrSet* pAttrSet = rTextNode.GetpSwAttrSet())
-{
-const SvxCharRotateItem& rCharRotate = 
pAttrSet->GetCharRotate();
-if (rCharRotate.GetValue() == 900)
-{
-m_pSerializer->singleElementNS( XML_w, 
XML_textDirection, FSNS( XML_w, XML_val ), "btLr", FSEND );
-m_bBtLr = true;
-}
-}
-}
-}
+m_pSerializer->singleElementNS( XML_w, XML_textDirection,
+   FSNS( XML_w, XML_val ), "btLr",
+   FSEND );
 }
 
 const SwWriteTableRows& rRows = m_xTableWrt->GetRows( );
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx 
b/writer

no source code in https://repo1.maven.org/maven2/org/libreoffice/unoil/5.4.2/

[LORENZO Vincent]

Hello everybody,
I'm developing a document generator based on LibreOffice API 
for the software Eclipse Papyrus (under EPL V2 (Eclipse Public License V2 )). 
As LibreOffice API is not under EPL license, the Eclipse Foundation has a 
process to allow me to use this API. Eclipse is checking the license 
compatibility and checks the source code too.
In order to do that, I provided to Eclipse several jar sources (Unoil, juh, 
ridl, ...). Unfortunately, there is problem with 
https://repo1.maven.org/maven2/org/libreoffice/unoil/5.4.2/unoil-5.4.2-sources.jar
 , the jar is empty.

Initially my question would be : "Does someone know, how I can get easily the 
source of the unoil jar ? "

But after checking on Internet, I found this page for OpenOffice: 
https://wiki.openoffice.org/wiki/Uno/Java/MavenBundles  were it is written:

The Maven Repository requires a sources and javadoc jar even if they are empty. 
We need to include a README file to explain this. The contents of the README 
file for unoil should contain:
No Java source files or Javadocs exist for the UNO Interface Library.
unoil.jar is built from class files generated from IDL files during a complete 
build of Apache OpenOffice.
The IDL documentation can be found here:
http://www.openoffice.org/api/docs/common/ref/com/sun/star/module-ix.html

Create the empty jar files from  directory

jar cvfM unoil-4.1.2-sources.jar META-INF/LICENSE META-INF/NOTICE 
META-INF/README

jar cvfM unoil-4.1.2-javadoc.jar META-INF/LICENSE META-INF/NOTICE 
META-INF/README


So, there is no real jar source for it, only idl files. Right ?
So, I would try to provide these idl files to Eclipse. Please could you confirm 
me that all contents of unoil.jar comes from the offapi folder of the git 
http://anongit.freedesktop.org/git/libreoffice/core.git .

Do you know which branch I must use to get the idl file used to generate 
unoil-5.4.2 ?


Thank you very much
Regards,
--
Vincent LORENZO
01-69-08-17-24
CEA Saclay Nano-INNOV
Institut CARNOT CEA LIST
Point Courrier n° 174
91 191 Gif sur Yvette CEDEX

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

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

[Libreoffice Gerrit user]

 sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx  |  144 ++---
 sd/source/ui/accessibility/AccessibleOutlineView.cxx   |   30 -
 sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx |   54 -
 sd/source/ui/accessibility/AccessibleSlideSorterView.cxx   |  108 +--
 sd/source/ui/animations/CustomAnimationDialog.cxx  |  310 +--
 sd/source/ui/animations/CustomAnimationList.cxx|   33 -
 sd/source/ui/animations/CustomAnimationPane.cxx|  365 ++---
 sd/source/ui/animations/SlideTransitionPane.cxx|   60 +-
 sd/source/ui/animations/motionpathtag.cxx  |  312 +--
 sd/source/ui/annotations/annotationmanager.cxx |  318 +--
 sd/source/ui/annotations/annotationtag.cxx |  224 +++
 sd/source/ui/annotations/annotationwindow.cxx  |  148 ++---
 sd/source/ui/app/optsitem.cxx  |  212 +++
 sd/source/ui/app/sdmod1.cxx|  150 ++---
 sd/source/ui/app/tmplctrl.cxx  |   62 +-
 sd/source/ui/controller/displaymodecontroller.cxx  |   25 
 sd/source/ui/dlg/LayerTabBar.cxx   |   78 +-
 sd/source/ui/dlg/PaneDockingWindow.cxx |   32 -
 sd/source/ui/dlg/SpellDialogChildWindow.cxx|   78 +-
 sd/source/ui/dlg/animobjs.cxx  |  254 -
 sd/source/ui/dlg/filedlg.cxx   |   42 -
 sd/source/ui/dlg/headerfooterdlg.cxx   |  118 ++--
 sd/source/ui/dlg/navigatr.cxx  |  136 ++--
 sd/source/ui/dlg/sdpreslt.cxx  |  100 +--
 sd/source/ui/dlg/sdtreelb.cxx  |  232 
 sd/source/ui/dlg/tpaction.cxx  |   72 +-
 sd/source/ui/dlg/tpoption.cxx  |   52 -
 sd/source/ui/docshell/docshel2.cxx |   36 -
 sd/source/ui/docshell/docshel4.cxx |  325 +--
 sd/source/ui/docshell/sdclient.cxx |  148 ++---
 30 files changed, 2136 insertions(+), 2122 deletions(-)

New commits:
commit 6d2c720dccc3a9d2d0dcaeaa7d6014b7acc5708f
Author: Noel Grandin 
AuthorDate: Thu Feb 14 09:12:41 2019 +0200
Commit: Noel Grandin 
CommitDate: Fri Feb 15 13:47:49 2019 +0100

loplugin:flatten in sd/source/ui/[a-c]*

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

diff --git a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx 
b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
index f86604ca3775..d7852eb6cda6 100644
--- a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
+++ b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
@@ -620,78 +620,78 @@ void
 const SolarMutexGuard aSolarGuard;
 uno::Reference< view::XSelectionSupplier >  xSel( mxController, 
uno::UNO_QUERY );
 
-if( xSel.is() )
+if( !xSel.is() )
+return;
+
+uno::Any aAny;
+
+if( ACCESSIBLE_SELECTION_CHILD_ALL == nAccessibleChildIndex )
 {
-uno::Any aAny;
+// Select or deselect all children.
 
-if( ACCESSIBLE_SELECTION_CHILD_ALL == nAccessibleChildIndex )
+if( !bSelect )
+xSel->select( aAny );
+else
 {
-// Select or deselect all children.
+uno::Reference< drawing::XShapes > xShapes = 
drawing::ShapeCollection::create(
+comphelper::getProcessComponentContext());
 
-if( !bSelect )
-xSel->select( aAny );
-else
+for(sal_Int32 i = 0, nCount = getAccessibleChildCount(); i < 
nCount; ++i )
 {
-uno::Reference< drawing::XShapes > xShapes = 
drawing::ShapeCollection::create(
-comphelper::getProcessComponentContext());
+AccessibleShape* pAcc = AccessibleShape::getImplementation( 
getAccessibleChild( i ) );
 
-for(sal_Int32 i = 0, nCount = getAccessibleChildCount(); i < 
nCount; ++i )
-{
-AccessibleShape* pAcc = 
AccessibleShape::getImplementation( getAccessibleChild( i ) );
-
-if( pAcc && pAcc->GetXShape().is() )
-xShapes->add( pAcc->GetXShape() );
-}
+if( pAcc && pAcc->GetXShape().is() )
+xShapes->add( pAcc->GetXShape() );
+}
 
-if( xShapes->getCount() )
-{
-xSel->select( Any(xShapes) );
-}
+if( xShapes->getCount() )
+{
+xSel->select( Any(xShapes) );
 }
 }
-else if( nAccessibleChildIndex >= 0 )
-{
-// Select or deselec

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

[Libreoffice Gerrit user]

 odk/config/cfgWin.js|2 +-
 odk/config/configure.pl |4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 31221c4f8fb1973d246fcf8f50886cf5811e8054
Author: Samuel Mehrbrodt 
AuthorDate: Wed Feb 13 08:10:55 2019 +0100
Commit: Samuel Mehrbrodt 
CommitDate: Fri Feb 15 14:36:38 2019 +0100

Adopt odk configure to new java 6 baseline

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

diff --git a/odk/config/cfgWin.js b/odk/config/cfgWin.js
index fa8961b460d1..1f001cc265e1 100644
--- a/odk/config/cfgWin.js
+++ b/odk/config/cfgWin.js
@@ -654,7 +654,7 @@ function getJavaHome()
 var bSkip = false;
 while(true)
 {
-stdout.Write("\n Enter JAVA SDK (1.4.1_01 or higher) installation 
directory (optional) [" + sSuggestedHome + "]:");
+stdout.Write("\n Enter JAVA SDK (1.6 or higher) installation directory 
(optional) [" + sSuggestedHome + "]:");
 var sHome = stdin.ReadLine();
 if (sHome.length == 0)
 {
diff --git a/odk/config/configure.pl b/odk/config/configure.pl
index bc56d8782944..f3d0e08b3440 100755
--- a/odk/config/configure.pl
+++ b/odk/config/configure.pl
@@ -75,7 +75,7 @@ $main::OO_SDK_CPP_HOME_SUGGESTION = 
searchprog($main::cppName);
 
 $main::OO_SDK_JAVA_HOME = "";
 $main::OO_SDK_JAVA_HOME_SUGGESTION = searchprog("javac");
-$main::javaVersion = "1.5.0_01";
+$main::javaVersion = "1.6";
 
 $main::SDK_AUTO_DEPLOYMENT = "";
 $main::SDK_AUTO_DEPLOYMENT_SUGGESTION = "YES";
@@ -393,7 +393,7 @@ while ( (!$main::correctVersion) &&
 ((! -d "$main::OO_SDK_JAVA_HOME" ) ||
  ((-d "$main::OO_SDK_JAVA_HOME") && (! -e 
"$main::OO_SDK_JAVA_HOME/bin/javac"))) )
 {
-print " Enter Java SDK (1.5, recommendation is 1.6 or higher) installation 
directory  (optional) [$main::OO_SDK_JAVA_HOME_SUGGESTION]: ";
+print " Enter Java SDK (1.6 or higher) installation directory (optional) 
[$main::OO_SDK_JAVA_HOME_SUGGESTION]: ";
 $main::OO_SDK_JAVA_HOME = readStdIn();
 chop($main::OO_SDK_JAVA_HOME);
 if ( $main::OO_SDK_JAVA_HOME eq "" )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 include/svx/txencbox.hxx|  103 --
 sc/inc/scabstdlg.hxx|   10 -
 sc/source/ui/attrdlg/scdlgfact.cxx  |   24 +--
 sc/source/ui/attrdlg/scdlgfact.hxx  |   20 +-
 sc/source/ui/dbgui/scuiimoptdlg.cxx |  255 
 sc/source/ui/inc/scuiimoptdlg.hxx   |   59 
 sc/source/ui/unoobj/filtuno.cxx |2 
 sc/uiconfig/scalc/ui/imoptdialog.ui |   73 --
 svx/source/dialog/txencbox.cxx  |  232 
 9 files changed, 503 insertions(+), 275 deletions(-)

New commits:
commit 36af12e74f4fa20712a3671c1be2a3a4b5a54e7d
Author: Caolán McNamara 
AuthorDate: Fri Feb 15 12:58:05 2019 +
Commit: Caolán McNamara 
CommitDate: Fri Feb 15 15:54:39 2019 +0100

weld ScImportOptionsDlg

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

diff --git a/include/svx/txencbox.hxx b/include/svx/txencbox.hxx
index 4cf66c7c1641..f2edcb83f6d5 100644
--- a/include/svx/txencbox.hxx
+++ b/include/svx/txencbox.hxx
@@ -54,6 +54,50 @@ public:
 sal_uInt32 nButIncludeInfoFlags = 0
 );
 
+/** Fill with all known MIME encodings and select the best according to
+GetBestMimeEncoding
+ */
+voidFillWithMimeAndSelectBest();
+
+voidInsertTextEncoding( const rtl_TextEncoding nEnc );
+
+voidInsertTextEncoding( const rtl_TextEncoding nEnc,
+const OUString& rEntry );
+
+voidSelectTextEncoding( const rtl_TextEncoding nEnc );
+
+rtl_TextEncodingGetSelectTextEncoding() const;
+};
+
+class SVX_DLLPUBLIC TextEncodingBox
+{
+private:
+std::unique_ptr m_xControl;
+
+public:
+TextEncodingBox(std::unique_ptr pControl);
+
+~TextEncodingBox();
+
+/** Fill with all known encodings but exclude those matching one or more
+given flags as defined in rtl/tencinfo.h
+
+  If nButIncludeInfoFlags is given, encodings are included even if 
they
+ match nExcludeInfoFlags. Thus it is possible to exclude 16/32-bit
+ Unicode with RTL_TEXTENCODING_INFO_UNICODE but to include UTF7 and 
UTF8
+ with RTL_TEXTENCODING_INFO_MIME 
+
+@param bExcludeImportSubsets
+If , some specific encodings are not listed, as they are a
+subset of another encoding. This is the case for
+RTL_TEXTENCODING_GB_2312, RTL_TEXTENCODING_GBK,
+RTL_TEXTENCODING_MS_936, which are covered by
+RTL_TEXTENCODING_GB_18030. Normally, this flag should be set to
+ whenever the box is used in import dialogs. */
+voidFillFromTextEncodingTable(
+bool bExcludeImportSubsets,
+sal_uInt32 nExcludeInfoFlags = 0);
+
 /** Fill with all encodings known to the dbtools::OCharsetMap but exclude
 those matching one or more given flags as defined in rtl/tencinfo.h
 
@@ -71,13 +115,7 @@ public:
  whenever the box is used in import dialogs. */
 voidFillFromDbTextEncodingMap(
 bool bExcludeImportSubsets,
-sal_uInt32 nExcludeInfoFlags = 0
-);
-
-/** Fill with all known MIME encodings and select the best according to
-GetBestMimeEncoding
- */
-voidFillWithMimeAndSelectBest();
+sal_uInt32 nExcludeInfoFlags = 0);
 
 voidInsertTextEncoding( const rtl_TextEncoding nEnc );
 
@@ -87,17 +125,21 @@ public:
 voidSelectTextEncoding( const rtl_TextEncoding nEnc );
 
 rtl_TextEncodingGetSelectTextEncoding() const;
+
+void connect_changed(const Link& rLink) { 
m_xControl->connect_changed(rLink); }
+void grab_focus() { m_xControl->grab_focus(); }
+void show() { m_xControl->show(); }
 };
 
-class SVX_DLLPUBLIC TextEncodingBox
+class SVX_DLLPUBLIC TextEncodingTreeView
 {
 private:
-std::unique_ptr m_xControl;
+std::unique_ptr m_xControl;
 
 public:
-TextEncodingBox(std::unique_ptr pControl);
+TextEncodingTreeView(std::unique_ptr pControl);
 
-~TextEncodingBox();
+~TextEncodingTreeView();
 
 /** Fill with all known encodings but exclude those matching one or more
 given flags as defined in rtl/tencinfo.h
@@ -115,8 +157,29 @@ public:
 RTL_TEXTENCODING_GB_18030. Normally, this flag should be set to
  whenever the box is used in import dialogs. */
 voidFillFromTextEncodingTable(
-bool bExcludeImportSubsets
-);
+bool bExcludeImportSubsets,
+sal_uInt32 nExcludeInf

[Libreoffice-commits] core.git: Branch 'feature/msforms' - 4 commits - include/xmloff officecfg/registry sw/inc sw/Library_swui.mk sw/sdi sw/source sw/uiconfig sw/UIConfig_swriter.mk

[Libreoffice Gerrit user]

 include/xmloff/odffields.hxx |1 
 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |   29 +
 sw/Library_swui.mk   |1 
 sw/UIConfig_swriter.mk   |1 
 sw/inc/cmdid.h   |6 
 sw/inc/swabstdlg.hxx |4 
 sw/sdi/_textsh.sdi   |   18 
 sw/sdi/swriter.sdi   |   53 +
 sw/source/core/doc/docbm.cxx |6 
 sw/source/core/text/itrform2.cxx |4 
 sw/source/ui/dialog/swdlgfact.cxx|   12 
 sw/source/ui/dialog/swdlgfact.hxx|   14 
 sw/source/ui/dialog/swuiexp.cxx  |1 
 sw/source/ui/fldui/DropDownFormFieldDialog.cxx   |  191 
+++
 sw/source/uibase/inc/DropDownFormFieldDialog.hxx |   69 ++
 sw/source/uibase/shells/textfld.cxx  |   45 +
 sw/source/uibase/uiview/viewling.cxx |   11 
 sw/uiconfig/swriter/menubar/mscompatibleformsmenu.xml|7 
 sw/uiconfig/swriter/ui/dropdownformfielddialog.ui|  272 
++
 19 files changed, 744 insertions(+), 1 deletion(-)

New commits:
commit e932812d0ca9486d6292ad1bdfdd4993dada06fc
Author: Tamás Zolnai 
AuthorDate: Thu Feb 14 13:15:41 2019 +0100
Commit: Tamás Zolnai 
CommitDate: Thu Feb 14 13:15:41 2019 +0100

MSForms: Don't show popup dialog of drop-down field when there is no item 
list

Change-Id: Ife361e0ee18437da6f188e77713ea51403b70dbc

diff --git a/sw/source/uibase/uiview/viewling.cxx 
b/sw/source/uibase/uiview/viewling.cxx
index 935f974ce75a..c29c1637ab87 100644
--- a/sw/source/uibase/uiview/viewling.cxx
+++ b/sw/source/uibase/uiview/viewling.cxx
@@ -912,6 +912,17 @@ IMPL_LINK_NOARG(SwView, FieldPopupModeEndHdl, 
FloatingWindow*, void)
 
 void SwView::ExecFieldPopup( const Point& rPt, IFieldmark *fieldBM )
 {
+// Don't show popup if there is no list item
+auto pListEntries = fieldBM->GetParameters()->find( 
ODF_FORMDROPDOWN_LISTENTRY );
+Sequence< OUString > vListEntries;
+if(pListEntries != fieldBM->GetParameters()->end())
+{
+pListEntries->second >>= vListEntries;
+}
+
+if(vListEntries.getLength() == 0)
+return;
+
 const Point aPixPos = GetEditWin().LogicToPixel( rPt );
 
 m_pFieldPopup = VclPtr::Create( m_pEditWin, fieldBM );
commit 3068c477475c0e2330fe0abdb55fcf21ae09fc77
Author: Tamás Zolnai 
AuthorDate: Thu Feb 14 12:56:55 2019 +0100
Commit: Tamás Zolnai 
CommitDate: Thu Feb 14 12:56:55 2019 +0100

MSForms: Introduce a properties dialog for Drop-down form field

- Dialog created similar to the edit dialog of Input field
- On the dialog, the user can edit the list of the drop down field
- This dialog is only for editing of the field, so the user can't select
an item from the list to display in the field.

Change-Id: I6222aba9b211afeb0e9d10d97a49347921ff7353

diff --git a/sw/Library_swui.mk b/sw/Library_swui.mk
index bbacb517f697..2da933936257 100644
--- a/sw/Library_swui.mk
+++ b/sw/Library_swui.mk
@@ -110,6 +110,7 @@ $(eval $(call gb_Library_add_exception_objects,swui,\
 sw/source/ui/envelp/labprt \
 sw/source/ui/envelp/mailmrge \
 sw/source/ui/fldui/DropDownFieldDialog \
+sw/source/ui/fldui/DropDownFormFieldDialog \
 sw/source/ui/fldui/FldRefTreeListBox \
 sw/source/ui/fldui/changedb \
 sw/source/ui/fldui/flddb \
diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk
index 5e03ab5d3d7f..4e0b7ecfc037 100644
--- a/sw/UIConfig_swriter.mk
+++ b/sw/UIConfig_swriter.mk
@@ -123,6 +123,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/datasourcesunavailabledialog \
sw/uiconfig/swriter/ui/dropcapspage \
sw/uiconfig/swriter/ui/dropdownfielddialog \
+   sw/uiconfig/swriter/ui/dropdownformfielddialog \
sw/uiconfig/swriter/ui/editcategories \
sw/uiconfig/swriter/ui/editfielddialog \
sw/uiconfig/swriter/ui/editsectiondialog \
diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx
index 075d41e873c0..7f0b059bb0a4 100644
--- a/sw/inc/swabstdlg.hxx
+++ b/sw/inc/swabstdlg.hxx
@@ -76,6 +76,9 @@ namespace com{namespace sun{namespace star{
 namespace container { class XNamed; }
 }}}
 
+
+namespace sw { namespace mark { class IFieldmark; } }
+
 typedef   void (*SwLabDlgMethod) (css::uno::Reference< css::frame::XModel> 
const & xModel, const SwLabItem& rItem);
 
 typedef OUString(*GlossaryGetCurrGroup)();
@@ -387,6 +390,7 @@ public:
 
 virtual VclPtr 
CreateDrop

RE: need help to insert an image with a caption with the Libo java API

[LORENZO Vincent]

Hello everybody, 
I thank you for your answers. Yes I want to add an image with a caption 
programmatically and I want a caption like this "Illustration 1 : My caption"
To my mind, it would be better/cleaner if I was able to generate the same thing 
than I do the UI. Thanks to you, I succeed to build the expected structure for 
the image and to set a text below it, but I still have some problems, mainly 
with the GetReference.

The GetReference generates :
Erreur : source de la référence non 
trouvée  (sorry my Libo is in French, it is written "Sorry 
: source of the reference not found").

And I would like to get a text:sequence instead of a text:reference, to get 
this result:
1

Please, do you know how I can build a text:sequence  ?
 
Please found in attachment the java code I wrote [1], the expect xml structure 
[2] and the current xml structure [3].
I know I have some difference between [2] and [3] with the width/height 
properties and inside the draw frame, but it is not the subject of this thread. 

[1] insertImage.java
[2] expectedResult.xml
[3] currentResult.xml

In addition, I have more generic question, do you know if it exists a 
documentation, indicating mapping, between the xml elements and how to 
get/create them from java ? For example, in xml svg:width is called Height in 
the java API, and my Textframe becomes mailto:mikekagan...@hotmail.com] 
Envoyé : mercredi 13 février 2019 11:42
À : Miklos Vajna ; LORENZO Vincent 

Cc : libreoffice@lists.freedesktop.org
Objet : Re: need help to insert an image with a caption with the Libo java API

On 13.02.2019 12:45, Miklos Vajna via LibreOffice wrote:
> Hi,
> 
> On Tue, Feb 12, 2019 at 09:27:15AM +, LORENZO Vincent 
>  wrote:
>> I would like to add a caption, to an inserted image in a text 
>> document, but I don't find how to do that... Please do you have 
>> pointer/documentation for me ?
> 
> I think captions are just a UI feature. The doc model just stores a 
> text frame around the image and the image is followed by the caption itself.
> 
> (I.e. later it's not possible to reliably detect if some content 
> around an image in a frame was created by hand or using the captions 
> UI code.)
> 
> So you can do the same "manually" using the UNO API. When in doubt, 
> see what UNO API the ODT import uses to create the doc model based on 
> the input markup.

And actually, if an image is not intended to be floating, but (as seen in 
majority of cases) is a part of normal text flow, then the frame could be not 
needed at all - simply add an image anchored as character, then add a paragraph 
with required style and numbering range field, then continue with other 
paragraphs. This makes the document structure clearer. Just an advise based on 
own experience.

--
Best regards,
Mike Kaganski


InsertImage.java
Description: InsertImage.java

	
		
			


			
			Illustration
			
			Erreur : source de la
référence non trouvée
			a nice Figure
		
	

	
		
			

			
			

			
			Illustration
			1
			: My caption
		
	

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

[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-1+backports' - sc/qa sc/source

[Libreoffice Gerrit user]

 sc/qa/unit/data/ods/tdf121040.ods  |binary
 sc/qa/unit/subsequent_filters-test.cxx |   18 ++
 sc/source/core/data/column2.cxx|   16 +---
 sc/source/ui/view/output2.cxx  |6 --
 4 files changed, 35 insertions(+), 5 deletions(-)

New commits:
commit c4f0a9dbe4aa4d3f418971b62b82620fe5e203d4
Author: Serge Krot 
AuthorDate: Wed Feb 6 20:02:02 2019 +0100
Commit: Thorsten Behrens 
CommitDate: Fri Feb 15 15:44:44 2019 +0100

tdf#121040 sc: cell with ### has too big height

Make the same behavior as inside MSO - numbers with any
different number format should not be broken on two or more lines
regardless "wrap text automatically" option.

Change-Id: I135ecef1ad01171dd22828100309311bd8eea6ce
Reviewed-on: https://gerrit.libreoffice.org/67470
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 
Reviewed-on: https://gerrit.libreoffice.org/67729
Tested-by: Thorsten Behrens 

diff --git a/sc/qa/unit/data/ods/tdf121040.ods 
b/sc/qa/unit/data/ods/tdf121040.ods
new file mode 100644
index ..ef25565a7ea8
Binary files /dev/null and b/sc/qa/unit/data/ods/tdf121040.ods differ
diff --git a/sc/qa/unit/subsequent_filters-test.cxx 
b/sc/qa/unit/subsequent_filters-test.cxx
index 326dc0608f29..83a803f71374 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -194,6 +194,7 @@ public:
 void testMiscRowHeights();
 void testOptimalHeightReset();
 void testCustomNumFormatHybridCellODS();
+void testTdf121040();
 
 void testPrintRangeODS();
 void testOutlineODS();
@@ -329,6 +330,7 @@ public:
 CPPUNIT_TEST(testMiscRowHeights);
 CPPUNIT_TEST(testOptimalHeightReset);
 CPPUNIT_TEST(testCustomNumFormatHybridCellODS);
+CPPUNIT_TEST(testTdf121040);
 CPPUNIT_TEST(testPrintRangeODS);
 CPPUNIT_TEST(testOutlineODS);
 CPPUNIT_TEST(testColumnStyleXLSX);
@@ -2748,6 +2750,22 @@ void ScFiltersTest::testCustomNumFormatHybridCellODS()
 xDocSh->DoClose();
 }
 
+void ScFiltersTest::testTdf121040()
+{
+ScDocShellRef xDocSh = loadDoc("tdf121040.", FORMAT_ODS);
+CPPUNIT_ASSERT_MESSAGE("Failed to load tdf121040.ods", xDocSh.is());
+
+const SCTAB nTab = 0;
+ScDocument& rDoc = xDocSh->GetDocument();
+
+// The first 9 rows should have the same height
+const sal_uInt16 nHeight = rDoc.GetRowHeight(0, nTab, false);
+for (SCTAB nRow=1; nRow<9; nRow++)
+{
+CPPUNIT_ASSERT_EQUAL(nHeight, rDoc.GetRowHeight(nRow, nTab, false));
+}
+}
+
 void ScFiltersTest::testPrintRangeODS()
 {
 ScDocShellRef xDocSh = loadDoc("print-range.", FORMAT_ODS);
diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index 89ac4e47fe53..c7883862674f 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -159,8 +159,18 @@ long ScColumn::GetNeededSize(
 
 SvNumberFormatter* pFormatter = pDocument->GetFormatTable();
 sal_uInt32 nFormat = pPattern->GetNumberFormat( pFormatter, pCondSet );
-// #i111387# disable automatic line breaks only for "General" number format
-if (bBreak && ( nFormat % SV_COUNTRY_LANGUAGE_OFFSET ) == 0 )
+
+// get "cell is value" flag
+// Must be synchronized with ScOutputData::LayoutStrings()
+bool bCellIsValue = (aCell.meType == CELLTYPE_VALUE);
+if (aCell.meType == CELLTYPE_FORMULA)
+{
+ScFormulaCell* pFCell = aCell.mpFormula;
+bCellIsValue = pFCell->IsRunning() || pFCell->IsValue();
+}
+
+// #i111387#, tdf#121040: disable automatic line breaks for all number 
formats
+if (bBreak && bCellIsValue && (pFormatter->GetType(nFormat) == 
SvNumFormatType::NUMBER))
 {
 // If a formula cell needs to be interpreted during aCell.hasNumeric()
 // to determine the type, the pattern may get invalidated because the
@@ -182,7 +192,7 @@ long ScColumn::GetNeededSize(
 else
 {
 nFormat = pPattern->GetNumberFormat( pFormatter, pCondSet );
-if ((nFormat % SV_COUNTRY_LANGUAGE_OFFSET) == 0)
+if (pFormatter->GetType(nFormat) == SvNumFormatType::NUMBER)
 bBreak = false;
 }
 }
diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx
index 3dfaaa9889f9..3f1f463b5d6b 100644
--- a/sc/source/ui/view/output2.cxx
+++ b/sc/source/ui/view/output2.cxx
@@ -1716,8 +1716,10 @@ tools::Rectangle ScOutputData::LayoutStrings(bool 
bPixelToLogic, bool bPaint, co
 *pPattern, pCondSet, mpDoc, nTab, 
bNumberFormatIsText );
 
 bool bBreak = ( aVars.GetLineBreak() || aVars.GetHorJust() 
== SvxCellHorJustify::Block );
-// #i111387# #o11817313# disable automatic line breaks 
only for "General" number format
-if (bBreak && bCellIsValue && 
(aVars.GetResultValueFormat() % SV_COUNTRY_LANGUAGE_OFFSET) == 0)
+

[Libreoffice-commits] core.git: registry/inc registry/IwyuFilter_registry.yaml registry/source registry/tools

[Libreoffice Gerrit user]

 registry/IwyuFilter_registry.yaml |   16 
 registry/inc/regapi.hxx   |1 -
 registry/source/keyimpl.hxx   |1 -
 registry/source/reflcnst.hxx  |3 +--
 registry/source/reflread.cxx  |1 -
 registry/source/reflread.hxx  |1 -
 registry/source/reflwrit.cxx  |3 +--
 registry/source/reflwrit.hxx  |5 +++--
 registry/source/regimpl.cxx   |3 +--
 registry/source/regimpl.hxx   |2 +-
 registry/source/registry.cxx  |9 -
 registry/source/regkey.cxx|2 --
 registry/tools/fileurl.cxx|1 -
 registry/tools/options.cxx|1 -
 registry/tools/options.hxx|2 --
 15 files changed, 23 insertions(+), 28 deletions(-)

New commits:
commit 3478f4741c4a27e35a2b068a624648114d84a8f1
Author: Gabor Kelemen 
AuthorDate: Mon Feb 11 01:28:33 2019 +0100
Commit: Miklos Vajna 
CommitDate: Fri Feb 15 11:19:29 2019 +0100

tdf#42949 Fix IWYU warnings in registry/

Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.

Change-Id: I819bb44e36bdb6ec671cf11bd779085767d82fd0
Reviewed-on: https://gerrit.libreoffice.org/67697
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 

diff --git a/registry/IwyuFilter_registry.yaml 
b/registry/IwyuFilter_registry.yaml
new file mode 100644
index ..d7d93bdc6295
--- /dev/null
+++ b/registry/IwyuFilter_registry.yaml
@@ -0,0 +1,16 @@
+---
+assumeFilename: registry/source/registry.cxx
+blacklist:
+registry/source/regimpl.hxx:
+# Needed for correct linker visibility
+- regapi.hxx
+registry/source/reflwrit.cxx:
+# OSL_BIGENDIAN is being checked
+- osl/endian.h
+# Needed for correct linker visibility
+- registry/writer.h
+registry/source/reflread.cxx:
+# OSL_BIGENDIAN is being checked
+- osl/endian.h
+# Needed for correct linker visibility
+- registry/typereg_reader.hxx
diff --git a/registry/inc/regapi.hxx b/registry/inc/regapi.hxx
index 35c4ddda35a9..ae5b7e119e48 100644
--- a/registry/inc/regapi.hxx
+++ b/registry/inc/regapi.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_REGISTRY_INC_REGAPI_HXX
 #define INCLUDED_REGISTRY_INC_REGAPI_HXX
 
-#include 
 #include 
 #include 
 #include 
diff --git a/registry/source/keyimpl.hxx b/registry/source/keyimpl.hxx
index d5c6ada33395..a964866d68bd 100644
--- a/registry/source/keyimpl.hxx
+++ b/registry/source/keyimpl.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_REGISTRY_SOURCE_KEYIMPL_HXX
 #define INCLUDED_REGISTRY_SOURCE_KEYIMPL_HXX
 
-#include 
 #include "regimpl.hxx"
 #include 
 
diff --git a/registry/source/reflcnst.hxx b/registry/source/reflcnst.hxx
index a0ee421d5089..2fff0ca7340e 100644
--- a/registry/source/reflcnst.hxx
+++ b/registry/source/reflcnst.hxx
@@ -20,8 +20,7 @@
 #ifndef INCLUDED_REGISTRY_SOURCE_REFLCNST_HXX
 #define INCLUDED_REGISTRY_SOURCE_REFLCNST_HXX
 
-#include 
-#include 
+#include 
 
 #include 
 
diff --git a/registry/source/reflread.cxx b/registry/source/reflread.cxx
index f090383c6199..b799e8b30ef2 100644
--- a/registry/source/reflread.cxx
+++ b/registry/source/reflread.cxx
@@ -24,7 +24,6 @@
 #include 
 #include 
 
-#include 
 #include 
 #include 
 #include 
diff --git a/registry/source/reflread.hxx b/registry/source/reflread.hxx
index 880b6bcaddc0..e35e3e03e346 100644
--- a/registry/source/reflread.hxx
+++ b/registry/source/reflread.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_REGISTRY_SOURCE_REFLREAD_HXX
 
 #include 
-#include 
 #include 
 
 /// Implememetation handle
diff --git a/registry/source/reflwrit.cxx b/registry/source/reflwrit.cxx
index 9c753cf9c444..e06f575a859c 100644
--- a/registry/source/reflwrit.cxx
+++ b/registry/source/reflwrit.cxx
@@ -22,13 +22,12 @@
 #include 
 #include 
 #include 
-#include 
 #include 
-#include 
 #include 
 #include 
 
 #include "reflwrit.hxx"
+#include 
 #include 
 #include 
 
diff --git a/registry/source/reflwrit.hxx b/registry/source/reflwrit.hxx
index 39a703259f64..6ea4d0e3a925 100644
--- a/registry/source/reflwrit.hxx
+++ b/registry/source/reflwrit.hxx
@@ -20,10 +20,11 @@
 #ifndef INCLUDED_REGISTRY_SOURCE_REFLWRIT_HXX
 #define INCLUDED_REGISTRY_SOURCE_REFLWRIT_HXX
 
-#include 
-#include 
+#include 
 #include 
 
+class RTConstValue;
+
 /// Implememetation handle
 typedef void* TypeWriterImpl;
 
diff --git a/registry/source/regimpl.cxx b/registry/source/regimpl.cxx
index 9f01788b0f4b..ea074732df12 100644
--- a/registry/source/regimpl.cxx
+++ b/registry/source/regimpl.cxx
@@ -21,6 +21,7 @@
 #include "regimpl.hxx"
 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -36,13 +37,11 @@
 #include 
 #include 
 #include 
-#include 
 
 #include "reflcnst.hxx"
 #include "keyimpl.hxx"
 
 #include 
-#include 
 #include 
 #include 
 #include 
diff --git a/registry/source/regimpl.hxx b/registry/source/regimpl.hxx
index 928807bc6642..d8a77394f2ac 100644
--- a/registry/source/regimpl.hxx
+++ b/registry/source/regimpl.hxx
@@ -20,10 +20,10 @@
 #ifndef INCLUDED_REGISTRY_

[Libreoffice-commits] help.git: Branch 'libreoffice-6-2' - CustomTarget_html.mk

[Libreoffice Gerrit user]

 CustomTarget_html.mk |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 18e278f7c01a22112d59d56e38794455e1166e41
Author: Stephan Bergmann 
AuthorDate: Fri Feb 15 10:14:37 2019 +0100
Commit: Xisco Faulí 
CommitDate: Fri Feb 15 14:19:27 2019 +0100

tdf#121532 Don't use non-standard `echo -n`

At least the version of echo used to build TDF's LO 6.2.0.3 release 
apparently
doesn't understand that non-standard option and printed out "-n" verbatim,
generating a broken languages.js.  (Though my local macOS 10.14.3 /bin/echo 
does
understand that option.)

Change-Id: I7233fa5c6e7851c5086c428a67aaee71604061e1
Reviewed-on: https://gerrit.libreoffice.org/67858
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 
(cherry picked from commit 8986dec8229cf31ccfadb61e6e90c905f7033ac7)
Reviewed-on: https://gerrit.libreoffice.org/67859
Tested-by: Xisco Faulí 
Reviewed-by: Xisco Faulí 

diff --git a/CustomTarget_html.mk b/CustomTarget_html.mk
index 7c5a9ddc8..b3c9b4e69 100644
--- a/CustomTarget_html.mk
+++ b/CustomTarget_html.mk
@@ -52,9 +52,9 @@ $(call 
gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/hid2file.js : \
 $(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/languages.js : \
$(SRCDIR)/helpcontent2/CustomTarget_html.mk
( \
-   echo -n 'var languagesSet = new Set([' ; \
-   for lang in $(gb_HELP_LANGS) ; do echo -n "'$$lang', " ; done | 
sed 's/, $$//' ; \
-   echo ']);' \
+   printf 'var languagesSet = new Set([' ; \
+   for lang in $(gb_HELP_LANGS) ; do printf '%s' "'$$lang', " ; 
done | sed 's/, $$//' ; \
+   printf ']);\n' \
) > $@
 
 define html_gen_langnames_js_dep
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sw/source/ui/vba/vbaapplication.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 58a2473d6672eb4ae4f55c3fe4c25ea23d932db5
Author: Tor Lillqvist 
AuthorDate: Fri Feb 15 12:37:11 2019 +0200
Commit: Tor Lillqvist 
CommitDate: Fri Feb 15 12:37:50 2019 +0200

Initialise an integer to 0, not false

Change-Id: I9d85f6a86d96353312bb00aeb1c173fa9fdfefda

diff --git a/sw/source/ui/vba/vbaapplication.cxx 
b/sw/source/ui/vba/vbaapplication.cxx
index 767709ad40c4..962029e793ff 100644
--- a/sw/source/ui/vba/vbaapplication.cxx
+++ b/sw/source/ui/vba/vbaapplication.cxx
@@ -554,7 +554,7 @@ SwWordBasic::FileClose( const css::uno::Any& Save )
 {
 uno::Reference< frame::XModel > xModel( mpApp->getCurrentDocument(), 
uno::UNO_SET_THROW );
 
-sal_Int16 nSave = false;
+sal_Int16 nSave = 0;
 if (Save.hasValue() && (Save >>= nSave) && (nSave == 0 || nSave == 1))
 FileSave();
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/msforms' - 2 commits - officecfg/registry sw/sdi sw/source sw/uiconfig

[Libreoffice Gerrit user]

 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |   10 -
 officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu  |   15 ++
 sw/sdi/_textsh.sdi   |6 +
 sw/source/uibase/shells/textsh1.cxx  |   59 
++
 sw/uiconfig/swriter/menubar/mscompatibleformsmenu.xml|6 -
 5 files changed, 85 insertions(+), 11 deletions(-)

New commits:
commit 51ff0a68210f39c3f4b25af0c0c96fe53819d279
Author: Tamás Zolnai 
AuthorDate: Fri Feb 15 14:03:48 2019 +0100
Commit: Tamás Zolnai 
CommitDate: Fri Feb 15 14:03:48 2019 +0100

MSForms: Rework the MS compatible Forms menu a bit

* DateField is saved as a content control in MSO file formats
so let have it under content controls submenu
* The MS compatible forms menu is a Writer specific thing so better
to have the related commands as Writer commands.

Change-Id: I2d66130f54c055a422f56b18ff2c98667e4f6469

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 97b3e516ee4a..92c391049cbc 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -6833,16 +6833,6 @@
   More Fields
 
   
-  
-
-  ActiveX Controls
-
-  
-  
-
-  Legacy Forms
-
-  
 
   
 
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index b0b8e04cf3a7..1fdbd1c1aace 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -3402,6 +3402,21 @@
   1
 
   
+  
+
+  ActiveX Controls
+
+  
+  
+
+  Legacy Forms
+
+  
+  
+
+  Content Forms
+
+  
 
   
 
diff --git a/sw/uiconfig/swriter/menubar/mscompatibleformsmenu.xml 
b/sw/uiconfig/swriter/menubar/mscompatibleformsmenu.xml
index 4c8e34467d3e..4d157908dd71 100644
--- a/sw/uiconfig/swriter/menubar/mscompatibleformsmenu.xml
+++ b/sw/uiconfig/swriter/menubar/mscompatibleformsmenu.xml
@@ -21,7 +21,6 @@
   
   
   
-  
 
   
   
@@ -31,6 +30,11 @@
   
 
   
+  
+
+  
+
+  
 
   
 
commit f86de2767f9d936864c8fc9917e31ae487cb4a08
Author: Tamás Zolnai 
AuthorDate: Fri Feb 15 13:50:08 2019 +0100
Commit: Tamás Zolnai 
CommitDate: Fri Feb 15 13:50:08 2019 +0100

MSForms: Make Control Properties menu to work with drop-down form field

Change-Id: I25055c17d887a2f2a716d8325f46825cc408179e

diff --git a/sw/sdi/_textsh.sdi b/sw/sdi/_textsh.sdi
index f8c2daee6d65..3724ee041ecc 100644
--- a/sw/sdi/_textsh.sdi
+++ b/sw/sdi/_textsh.sdi
@@ -1694,5 +1694,11 @@ interface BaseText
 StateMethod = StateField ;
 ]
 
+SID_FM_CTL_PROPERTIES
+[
+ExecMethod = Execute ;
+StateMethod = GetState ;
+]
+
 }  // end of interface text
 
diff --git a/sw/source/uibase/shells/textsh1.cxx 
b/sw/source/uibase/shells/textsh1.cxx
index 8eb590a9b5a2..ff0cfae5a414 100644
--- a/sw/source/uibase/shells/textsh1.cxx
+++ b/sw/source/uibase/shells/textsh1.cxx
@@ -119,6 +119,8 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 
 using namespace ::com::sun::star;
 using namespace com::sun::star::beans;
@@ -1367,6 +1369,32 @@ void SwTextShell::Execute(SfxRequest &rReq)
 GetView().UpdateWordCount(this, nSlot);
 }
 break;
+case SID_FM_CTL_PROPERTIES:
+{
+SwPosition aPos(*GetShell().GetCursor()->GetPoint());
+sw::mark::IFieldmark* pFieldBM = 
GetShell().getIDocumentMarkAccess()->getFieldmarkFor(aPos);
+if ( !pFieldBM )
+{
+--aPos.nContent;
+pFieldBM = 
GetShell().getIDocumentMarkAccess()->getFieldmarkFor(aPos);
+}
+
+if ( pFieldBM && pFieldBM->GetFieldname() == ODF_FORMDROPDOWN )
+{
+SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
+ScopedVclPtr 
pDlg(pFact->CreateDropDownFormFieldDialog(rWrtSh.GetView().GetFrameWeld(), 
pFieldBM));
+pDlg->Execute();
+pFieldBM->Invalidate();
+rWrtSh.InvalidateWindows( rWrtSh.GetView().GetVisArea() );
+}
+else
+{
+SfxRequest aReq( GetView().GetViewFrame(), SID_FM_CTL_PROPERTIES );
+aReq.AppendItem( SfxBoolItem( SID_FM_CTL_PROPERTIES, true ) );
+rWrtSh.GetView().GetFormShell()->Execute( aReq );
+}
+}
+break;
 default:
 OSL_ENSURE(false, "wrong dispatcher");
 return;
@@ -

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

[Libreoffice Gerrit user]

 avmedia/source/gstreamer/gstplayer.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 18975274ddc585cc3e3e8b6ae5c2800b27723444
Author: Mark Hung 
AuthorDate: Wed Feb 13 23:25:08 2019 +0800
Commit: Mark Hung 
CommitDate: Fri Feb 15 14:38:28 2019 +0100

tdf#40780 extend default media duration from 0.01s to 0.3s.

Player can only update the duration when the state of the
GStreamer pipeline changes. But GStreamer need some time to get
ready. However the default duration (0.01s) is so short that
the audio node is deactivated before the duration update.
Hence I just pick up a value that is long enough to allow
update happen empirically.

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

diff --git a/avmedia/source/gstreamer/gstplayer.cxx 
b/avmedia/source/gstreamer/gstplayer.cxx
index 46432c764698..a81c386cc3c3 100644
--- a/avmedia/source/gstreamer/gstplayer.cxx
+++ b/avmedia/source/gstreamer/gstplayer.cxx
@@ -735,7 +735,7 @@ double SAL_CALL Player::getDuration()
 ::osl::MutexGuard aGuard(m_aMutex);
 
 // slideshow checks for non-zero duration, so cheat here
-double duration = 0.01;
+double duration = 0.3;
 
 if( mpPlaybin && mnDuration > 0 ) {
 duration = mnDuration / GST_SECOND;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 officecfg/registry/schema/org/openoffice/Office/Writer.xcs |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3473e1df1fa3483bae68a3c01fdd1b18def99745
Author: Samuel Mehrbrodt 
AuthorDate: Fri Feb 15 12:10:47 2019 +0100
Commit: Samuel Mehrbrodt 
CommitDate: Fri Feb 15 14:43:27 2019 +0100

Disable automatic border creation in sw

This "feature" would convert "___" to a full width paragraph border.

See e.g. 
https://ask.libreoffice.org/en/question/15711/stop-auto-line-formatting/
for problems caused by this.

So I strongly suggest to turn this "feature" off by default.

Change-Id: Ib0f650e408711e3409a5066f4c0941d2eb300787
Reviewed-on: https://gerrit.libreoffice.org/67865
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt 

diff --git a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
index 541f3984a21d..d18a5469079c 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
@@ -4472,7 +4472,7 @@
   Specifies whether borders are applied to paragraphs 
automatically.
   Apply border
 
-true
+false
   
   
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: oox/source opencl/source package/source

[Libreoffice Gerrit user]

 oox/source/core/contexthandler2.cxx |8 
 oox/source/core/xmlfilterbase.cxx   |   24 +-
 oox/source/drawingml/chart/typegroupconverter.cxx   |8 
 oox/source/drawingml/diagram/diagramlayoutatoms.cxx |   21 --
 oox/source/drawingml/shape.cxx  |   18 -
 oox/source/ole/vbacontrol.cxx   |   22 +-
 opencl/source/openclconfig.cxx  |   30 +--
 package/source/xstor/ohierarchyholder.cxx   |   16 -
 package/source/xstor/owriteablestream.cxx   |9 
 package/source/xstor/xstorage.cxx   |  196 
 package/source/zipapi/ZipFile.cxx   |   26 +-
 package/source/zippackage/ZipPackage.cxx|   11 -
 package/source/zippackage/ZipPackageFolder.cxx  |   33 +--
 package/source/zippackage/zipfileaccess.cxx |   27 +-
 14 files changed, 202 insertions(+), 247 deletions(-)

New commits:
commit 9d7620613d3ea2feb45a7ff57c4d2544bb1c6fe6
Author: Arkadiy Illarionov 
AuthorDate: Fri Feb 15 00:08:43 2019 +0300
Commit: Noel Grandin 
CommitDate: Fri Feb 15 12:21:28 2019 +0100

Simplify containers iterations in oox, opencl, package

Use range-based loop or replace with STL functions

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

diff --git a/oox/source/core/contexthandler2.cxx 
b/oox/source/core/contexthandler2.cxx
index a88d58b7d41a..ab9cea4a49fc 100644
--- a/oox/source/core/contexthandler2.cxx
+++ b/oox/source/core/contexthandler2.cxx
@@ -66,10 +66,10 @@ sal_Int32 ContextHandler2Helper::getCurrentElementWithMce() 
const
 
 sal_Int32 ContextHandler2Helper::getCurrentElement() const
 {
-for ( ContextStack::reverse_iterator It = mxContextStack->rbegin();
-  It != mxContextStack->rend(); ++It )
-if( getNamespace( It->mnElement ) != NMSP_mce )
-return It->mnElement;
+auto It = std::find_if(mxContextStack->rbegin(), mxContextStack->rend(),
+[](const ElementInfo& rItem) { return getNamespace(rItem.mnElement) != 
NMSP_mce; });
+if (It != mxContextStack->rend())
+return It->mnElement;
 return XML_ROOT_CONTEXT;
 }
 
diff --git a/oox/source/core/xmlfilterbase.cxx 
b/oox/source/core/xmlfilterbase.cxx
index 09d5dd63060d..8050c91b0d8e 100644
--- a/oox/source/core/xmlfilterbase.cxx
+++ b/oox/source/core/xmlfilterbase.cxx
@@ -782,30 +782,31 @@ writeCustomProperties( XmlFilterBase& rSelf, const 
Reference< XDocumentPropertie
 FSNS( XML_xmlns, XML_vt ),  
OUStringToOString(rSelf.getNamespaceURL(OOX_NS(officeDocPropsVT)), 
RTL_TEXTENCODING_UTF8).getStr(),
 FSEND );
 
-for (auto aIt = aprop.begin(); aIt != aprop.end(); ++aIt)
+size_t nIndex = 0;
+for (const auto& rProp : aprop)
 {
-if ( !aIt->Name.isEmpty() )
+if ( !rProp.Name.isEmpty() )
 {
-OString aName = OUStringToOString( aIt->Name, 
RTL_TEXTENCODING_ASCII_US );
+OString aName = OUStringToOString( rProp.Name, 
RTL_TEXTENCODING_ASCII_US );
 // pid starts from 2 not from 1 as MS supports pid from 2
 pAppProps->startElement( XML_property ,
 XML_fmtid,  "{D5CDD505-2E9C-101B-9397-08002B2CF9AE}",
-XML_pid,OString::number((aIt - aprop.begin()) + 2),
+XML_pid,OString::number(nIndex + 2),
 XML_name,   aName,
 FSEND);
 
-switch ( aIt->Value.getValueTypeClass() )
+switch ( rProp.Value.getValueTypeClass() )
 {
 case TypeClass_STRING:
 {
 OUString aValue;
-aIt->Value >>= aValue;
+rProp.Value >>= aValue;
 writeElement( pAppProps, FSNS( XML_vt, XML_lpwstr ), 
aValue );
 }
 break;
 case TypeClass_BOOLEAN:
 {
-bool val = *o3tl::forceAccess(aIt->Value);
+bool val = *o3tl::forceAccess(rProp.Value);
 writeElement( pAppProps, FSNS( XML_vt, XML_bool ), val ? 1 
: 0);
 }
 break;
@@ -815,23 +816,23 @@ writeCustomProperties( XmlFilterBase& rSelf, const 
Reference< XDocumentPropertie
 util::Date aDate;
 util::Duration aDuration;
 util::DateTime aDateTime;
-if ( ( aIt->Value ) >>= num )
+if ( rProp.Value >>= num )
 {
 writeElement( pAppProps, FSNS( XML_vt, XML_i4 ), num );
 }
-else if ( ( aIt->Value ) >>= aDate )
+else if ( rProp.Value >>= aDate )
 {
 aDateTime = util::DateTime( 0, 0 , 0, 0, aDate.Year, 
aD

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

[Libreoffice Gerrit user]

 sc/qa/extras/anchor.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 0a5660899790be31828ea37b3241a91554aadeb7
Author: Samuel Mehrbrodt 
AuthorDate: Fri Feb 15 08:23:00 2019 +0100
Commit: Samuel Mehrbrodt 
CommitDate: Fri Feb 15 11:37:09 2019 +0100

Remove unused import

Forgot to remove in e756b6f310f309ac29bb2bce92309bb74edd788d

Change-Id: I8e736726f81d87406473cd43e94870205d0f6902
Reviewed-on: https://gerrit.libreoffice.org/67855
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt 

diff --git a/sc/qa/extras/anchor.cxx b/sc/qa/extras/anchor.cxx
index 221a6da25289..9e0e920ec281 100644
--- a/sc/qa/extras/anchor.cxx
+++ b/sc/qa/extras/anchor.cxx
@@ -18,7 +18,6 @@
 #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: sw/qa sw/source

[Libreoffice Gerrit user]

 sw/qa/extras/layout/data/btlr-cell.odt |binary
 sw/qa/extras/layout/layout.cxx |7 +++
 sw/source/core/layout/newfrm.cxx   |   66 -
 3 files changed, 39 insertions(+), 34 deletions(-)

New commits:
commit 835d054434da5741a5bfa5f577e855594c40
Author: Miklos Vajna 
AuthorDate: Fri Feb 15 12:07:07 2019 +0100
Commit: Miklos Vajna 
CommitDate: Fri Feb 15 13:07:34 2019 +0100

sw btlr writing mode layout: fix multiple paragraphs

aVerticalLeftToRightBottomToTop was wrong, it mapped from physical to
logical, and it should be the other way around.

In practice this means that when SwTextFrame::AdjustFrame() is invoked
for a second lower, then nAdd will be a small positive (and not a large
negative) number, so the

warn:legacy.osl:20827:20827:sw/source/core/text/frmform.cxx:479: Ey

warning goes away and the second lower becomes visible.

Change-Id: I894fef4a89b1feeb333537ff7d76793130007ed8
Reviewed-on: https://gerrit.libreoffice.org/67862
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins

diff --git a/sw/qa/extras/layout/data/btlr-cell.odt 
b/sw/qa/extras/layout/data/btlr-cell.odt
index c010fa9f51b6..17a9c19eef25 100644
Binary files a/sw/qa/extras/layout/data/btlr-cell.odt and 
b/sw/qa/extras/layout/data/btlr-cell.odt differ
diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx
index bd720372dfb1..d29cc476f9cc 100644
--- a/sw/qa/extras/layout/layout.cxx
+++ b/sw/qa/extras/layout/layout.cxx
@@ -2807,10 +2807,15 @@ void SwLayoutWriter::testBtlrCell()
 
 #if !defined(MACOSX) && !defined(_WIN32) // macOS fails with actual == 2662 
for some reason.
 // Without the accompanying fix in place, this test would have failed with 
'Expected: 1915;
-// Actual  : 1756', i.e. the AAA text was too close to the left cell 
border due to an ascent vs
+// Actual  : 1756', i.e. the AAA1 text was too close to the left cell 
border due to an ascent vs
 // descent mismatch when calculating the baseline offset of the text 
portion.
 assertXPath(pXmlDoc, "//textarray[1]", "x", "1915");
 assertXPath(pXmlDoc, "//textarray[1]", "y", "2707");
+
+// Without the accompanying fix in place, this test would have failed with 
'Expected: 269;
+// Actual  : 0', i.e. the AAA2 frame was not visible due to 0 width.
+pXmlDoc = parseLayoutDump();
+assertXPath(pXmlDoc, 
"/root/page/body/tab/row/cell[1]/txt[2]/infos/bounds", "width", "269");
 #endif
 }
 
diff --git a/sw/source/core/layout/newfrm.cxx b/sw/source/core/layout/newfrm.cxx
index 0971c2d95a8e..94e016434e47 100644
--- a/sw/source/core/layout/newfrm.cxx
+++ b/sw/source/core/layout/newfrm.cxx
@@ -226,62 +226,62 @@ static SwRectFnCollection aVerticalLeftToRight = {
 
 /**
  * This is the same as horizontal, but rotated counter-clockwise by 90 degrees.
- * This means logical top is physical right, bottom is left, left is top,
- * finally right is bottom.
+ * This means logical top is physical left, bottom is right, left is bottom,
+ * finally right is top. Values map from logical to physical.
  */
 static SwRectFnCollection aVerticalLeftToRightBottomToTop = {
-/*.fnGetTop =*/&SwRect::Right_,
-/*.fnGetBottom =*/&SwRect::Left_,
-/*.fnGetLeft =*/&SwRect::Top_,
-/*.fnGetRight =*/&SwRect::Bottom_,
+/*.fnGetTop =*/&SwRect::Left_,
+/*.fnGetBottom =*/&SwRect::Right_,
+/*.fnGetLeft =*/&SwRect::Bottom_,
+/*.fnGetRight =*/&SwRect::Top_,
 /*.fnGetWidth =*/&SwRect::Height_,
 /*.fnGetHeight =*/&SwRect::Width_,
-/*.fnGetPos =*/&SwRect::TopRight,
+/*.fnGetPos =*/&SwRect::BottomLeft,
 /*.fnGetSize =*/&SwRect::SwappedSize,
 
-/*.fnSetTop =*/&SwRect::Right_,
-/*.fnSetBottom =*/&SwRect::Left_,
-/*.fnSetLeft =*/&SwRect::Top_,
-/*.fnSetRight =*/&SwRect::Bottom_,
+/*.fnSetTop =*/&SwRect::Left_,
+/*.fnSetBottom =*/&SwRect::Right_,
+/*.fnSetLeft =*/&SwRect::Bottom_,
+/*.fnSetRight =*/&SwRect::Top_,
 /*.fnSetWidth =*/&SwRect::Height_,
 /*.fnSetHeight =*/&SwRect::Width_,
 
-/*.fnSubTop =*/&SwRect::AddRight,
-/*.fnAddBottom =*/&SwRect::SubLeft,
-/*.fnSubLeft =*/&SwRect::SubTop,
-/*.fnAddRight =*/&SwRect::AddBottom,
+/*.fnSubTop =*/&SwRect::SubLeft,
+/*.fnAddBottom =*/&SwRect::AddRight,
+/*.fnSubLeft =*/&SwRect::AddBottom,
+/*.fnAddRight =*/&SwRect::SubTop,
 /*.fnAddWidth =*/&SwRect::AddHeight,
 /*.fnAddHeight =*/&SwRect::AddWidth,
 
 /*.fnSetPosX =*/&SwRect::SetPosY,
 /*.fnSetPosY =*/&SwRect::SetPosX,
 
-/*.fnGetTopMargin =*/&SwFrame::GetRightMargin,
-/*.fnGetBottomMargin =*/&SwFrame::GetLeftMargin,
-/*.fnGetLeftMargin =*/&SwFrame::GetTopMargin,
-/*.fnGetRightMargin =*/&SwFrame::GetBottomMargin,
+/*.fnGetTopMargin =*/&SwFrame::GetLeftMargin,
+/*.fnGetBottomMargin =*/&SwFrame::GetRightMargin,
+/*.fnGetLeftMargin =*/&SwFrame::GetBottomMargin,
+/*.fnGetRightMargin =*/&SwFrame::GetTo

[Libreoffice-commits] core.git: chart2/source compilerplugins/clang connectivity/source dbaccess/source desktop/source framework/inc sc/source sfx2/source svx/source sw/source vcl/source writerfilter/

[Libreoffice Gerrit user]

 chart2/source/tools/DataSeriesHelper.cxx|2 
 chart2/source/view/main/Clipping.cxx|4 
 compilerplugins/clang/simplifybool.cxx  |   96 
+-
 compilerplugins/clang/test/simplifybool.cxx |   58 ++
 connectivity/source/drivers/hsqldb/HCatalog.cxx |2 
 connectivity/source/drivers/mork/MResultSet.cxx |2 
 connectivity/source/drivers/mysql_jdbc/YCatalog.cxx |2 
 dbaccess/source/core/dataaccess/documentdefinition.cxx  |2 
 desktop/source/deployment/manager/dp_extensionmanager.cxx   |4 
 desktop/source/deployment/manager/dp_manager.cxx|6 
 desktop/source/deployment/misc/dp_descriptioninfoset.cxx|4 
 desktop/source/deployment/registry/executable/dp_executable.cxx |2 
 desktop/source/pkgchk/unopkg/unopkg_app.cxx |2 
 framework/inc/properties.h  |2 
 sc/source/core/data/dpsave.cxx  |6 
 sc/source/filter/excel/excrecds.cxx |2 
 sc/source/filter/excel/xehelper.cxx |2 
 sc/source/ui/view/formatsh.cxx  |   10 -
 sfx2/source/dialog/mgetempl.cxx |5 
 sfx2/source/doc/SfxDocumentMetaData.cxx |2 
 svx/source/svdraw/svdedxv.cxx   |2 
 sw/source/core/crsr/callnk.cxx  |2 
 sw/source/core/doc/gctable.cxx  |2 
 sw/source/core/doc/number.cxx   |4 
 sw/source/core/docnode/ndtbl1.cxx   |   12 -
 sw/source/core/layout/paintfrm.cxx  |4 
 sw/source/filter/html/css1atr.cxx   |6 
 sw/source/filter/ww8/ww8par3.cxx|2 
 sw/source/filter/xml/xmlimp.cxx |2 
 sw/source/uibase/uiview/view0.cxx   |2 
 vcl/source/app/IconThemeSelector.cxx|2 
 writerfilter/source/dmapper/DomainMapper.cxx|2 
 32 files changed, 201 insertions(+), 56 deletions(-)

New commits:
commit e132e781d8b01684d8ef51f060e90d465a21c677
Author: Noel Grandin 
AuthorDate: Thu Feb 14 13:01:42 2019 +0200
Commit: Noel Grandin 
CommitDate: Fri Feb 15 11:52:41 2019 +0100

loplugin:simplifybool extend to !(a == b) where comparison an overloaded op

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

diff --git a/chart2/source/tools/DataSeriesHelper.cxx 
b/chart2/source/tools/DataSeriesHelper.cxx
index 9a2957a11c37..389a10ededb8 100644
--- a/chart2/source/tools/DataSeriesHelper.cxx
+++ b/chart2/source/tools/DataSeriesHelper.cxx
@@ -625,7 +625,7 @@ bool hasAttributedDataPointDifferentValue( const Reference< 
chart2::XDataSeries
 if(!xPointProp.is())
 continue;
 uno::Any aPointValue( xPointProp->getPropertyValue( rPropertyName 
) );
-if( !( rPropertyValue==aPointValue ) )
+if( rPropertyValue != aPointValue )
 return true;
 }
 }
diff --git a/chart2/source/view/main/Clipping.cxx 
b/chart2/source/view/main/Clipping.cxx
index 354871612233..a7c212a91049 100644
--- a/chart2/source/view/main/Clipping.cxx
+++ b/chart2/source/view/main/Clipping.cxx
@@ -260,7 +260,7 @@ void Clipping::clipPolygonAtRectangle( const 
drawing::PolyPolygonShape3D& rPolyg
 // compose an Polygon of as many consecutive points as possible
 if(aFrom == aLast)
 {
-if( !(aTo==aFrom) )
+if( aTo != aFrom )
 {
 lcl_addPointToPoly( aResult, aTo, nNewPolyIndex, 
aResultPointCount, nOldPointCount );
 }
@@ -274,7 +274,7 @@ void Clipping::clipPolygonAtRectangle( const 
drawing::PolyPolygonShape3D& rPolyg
 nNewPolyIndex++;
 }
 lcl_addPointToPoly( aResult, aFrom, nNewPolyIndex, 
aResultPointCount, nOldPointCount );
-if( !(aTo==aFrom) )
+if( aTo != aFrom )
 lcl_addPointToPoly( aResult, aTo, nNewPolyIndex, 
aResultPointCount, nOldPointCount );
 }
 aLast = aTo;
diff --git a/compilerplugins/clang/simplifybool.cxx 
b/compilerplugins/clang/simplifybool.cxx
index 7109fcfb96a9..b4752b4108aa 100644
--- a/compilerplugins/clang/simplifybool.cxx
+++ b/compilerplugins/clang/simplifybool.cxx
@@ -53,6 +53,38 @@ Expr const * getSubExprOfLogicalNegation(Expr const

[Libreoffice-commits] help.git: CustomTarget_html.mk

[Libreoffice Gerrit user]

 CustomTarget_html.mk |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 8986dec8229cf31ccfadb61e6e90c905f7033ac7
Author: Stephan Bergmann 
AuthorDate: Fri Feb 15 10:14:37 2019 +0100
Commit: Stephan Bergmann 
CommitDate: Fri Feb 15 11:25:38 2019 +0100

tdf#121532 Don't use non-standard `echo -n`

At least the version of echo used to build TDF's LO 6.2.0.3 release 
apparently
doesn't understand that non-standard option and printed out "-n" verbatim,
generating a broken languages.js.  (Though my local macOS 10.14.3 /bin/echo 
does
understand that option.)

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

diff --git a/CustomTarget_html.mk b/CustomTarget_html.mk
index 7c5a9ddc8..b3c9b4e69 100644
--- a/CustomTarget_html.mk
+++ b/CustomTarget_html.mk
@@ -52,9 +52,9 @@ $(call 
gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/hid2file.js : \
 $(call gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/languages.js : \
$(SRCDIR)/helpcontent2/CustomTarget_html.mk
( \
-   echo -n 'var languagesSet = new Set([' ; \
-   for lang in $(gb_HELP_LANGS) ; do echo -n "'$$lang', " ; done | 
sed 's/, $$//' ; \
-   echo ']);' \
+   printf 'var languagesSet = new Set([' ; \
+   for lang in $(gb_HELP_LANGS) ; do printf '%s' "'$$lang', " ; 
done | sed 's/, $$//' ; \
+   printf ']);\n' \
) > $@
 
 define html_gen_langnames_js_dep
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sd/source/ui/func/fuinsert.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 74674905b77419620a79671942ecb44d3ba6b2a3
Author: Tor Lillqvist 
AuthorDate: Fri Feb 15 14:50:34 2019 +0200
Commit: Tor Lillqvist 
CommitDate: Fri Feb 15 14:50:59 2019 +0200

Fix build without HAVE_FEATURE_AVMEDIA

Change-Id: I65d16c3561fa6fd83aa37cb12ae4fd931d03029f

diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx
index 847bc39a3858..ffe73879d9c9 100644
--- a/sd/source/ui/func/fuinsert.cxx
+++ b/sd/source/ui/func/fuinsert.cxx
@@ -700,9 +700,9 @@ void FuInsertAVMedia::DoExecute( SfxRequest& rReq )
 bool bLink(true);
 if (!(bAPI
 #if HAVE_FEATURE_AVMEDIA
-|| ::avmedia::MediaWindow::executeMediaURLDialog(mpWindow ? 
mpWindow->GetFrameWeld() : nullptr, aURL, & bLink))
+|| ::avmedia::MediaWindow::executeMediaURLDialog(mpWindow ? 
mpWindow->GetFrameWeld() : nullptr, aURL, & bLink)
 #endif
-   )
+   ))
 return;
 
 Size aPrefSize;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sd/source/core/CustomAnimationEffect.cxx   |  256 ++--
 sd/source/core/EffectMigration.cxx |  492 
 sd/source/core/annotations/Annotation.cxx  |   46 
 sd/source/core/drawdoc.cxx |  122 +-
 sd/source/core/drawdoc2.cxx|  448 +++
 sd/source/core/drawdoc4.cxx|  174 +--
 sd/source/core/sdpage.cxx  |  840 +++---
 sd/source/core/sdpage2.cxx |   64 -
 sd/source/core/stlpool.cxx |  199 +--
 sd/source/core/stlsheet.cxx|  176 +--
 sd/source/core/undo/undoobjects.cxx|   30 
 sd/source/core/undoanim.cxx|   18 
 sd/source/filter/eppt/eppt.cxx |  246 ++--
 sd/source/filter/eppt/epptso.cxx   |  607 +-
 sd/source/filter/eppt/escherex.cxx |   54 
 sd/source/filter/eppt/pptexanimations.cxx  |  728 ++--
 sd/source/filter/eppt/pptexsoundcollection.cxx |   26 
 sd/source/filter/eppt/pptx-animations.cxx  |  201 +--
 sd/source/filter/eppt/pptx-stylesheet.cxx  |   50 
 sd/source/filter/eppt/pptx-text.cxx|  240 ++--
 sd/source/filter/html/buttonset.cxx|   20 
 sd/source/filter/html/htmlex.cxx   |   22 
 sd/source/filter/html/pubdlg.cxx   |   64 -
 sd/source/filter/ppt/pptin.cxx |  180 +--
 sd/source/filter/ppt/pptinanimations.cxx   | 1442 -
 sd/source/filter/ppt/propread.cxx  |   56 
 sd/source/filter/xml/sdtransform.cxx   |  104 -
 27 files changed, 3469 insertions(+), 3436 deletions(-)

New commits:
commit e2d2a3386fe85b0fa11fd26c3f7ca4c651eb2818
Author: Noel Grandin 
AuthorDate: Thu Feb 14 09:13:24 2019 +0200
Commit: Noel Grandin 
CommitDate: Fri Feb 15 13:48:25 2019 +0100

loplugin:flatten in sd/source/core

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

diff --git a/sd/source/core/CustomAnimationEffect.cxx 
b/sd/source/core/CustomAnimationEffect.cxx
index c9dda0acafad..4bda45524403 100644
--- a/sd/source/core/CustomAnimationEffect.cxx
+++ b/sd/source/core/CustomAnimationEffect.cxx
@@ -409,122 +409,122 @@ sal_Int32 CustomAnimationEffect::get_node_type( const 
Reference< XAnimationNode
 
 void CustomAnimationEffect::setPresetClass( sal_Int16 nPresetClass )
 {
-if( mnPresetClass != nPresetClass )
+if( mnPresetClass == nPresetClass )
+return;
+
+mnPresetClass = nPresetClass;
+if( !mxNode.is() )
+return;
+
+// first try to find a "preset-class" entry in the user data
+// and change it
+Sequence< NamedValue > aUserData( mxNode->getUserData() );
+sal_Int32 nLength = aUserData.getLength();
+bool bFound = false;
+if( nLength )
 {
-mnPresetClass = nPresetClass;
-if( mxNode.is() )
+NamedValue* p = aUserData.getArray();
+while( nLength-- )
 {
-// first try to find a "preset-class" entry in the user data
-// and change it
-Sequence< NamedValue > aUserData( mxNode->getUserData() );
-sal_Int32 nLength = aUserData.getLength();
-bool bFound = false;
-if( nLength )
+if ( p->Name == "preset-class" )
 {
-NamedValue* p = aUserData.getArray();
-while( nLength-- )
-{
-if ( p->Name == "preset-class" )
-{
-p->Value <<= mnPresetClass;
-bFound = true;
-break;
-}
-p++;
-}
-}
-
-// no "node-type" entry inside user data, so add it
-if( !bFound )
-{
-nLength = aUserData.getLength();
-aUserData.realloc( nLength + 1);
-aUserData[nLength].Name = "preset-class";
-aUserData[nLength].Value <<= mnPresetClass;
+p->Value <<= mnPresetClass;
+bFound = true;
+break;
 }
-
-mxNode->setUserData( aUserData );
+p++;
 }
 }
+
+// no "node-type" entry inside user data, so add it
+if( !bFound )
+{
+nLength = aUserData.getLength();
+aUserData.realloc( nLength + 1);
+aUserData[nLength].Name = "preset-class";
+aUserData[nLength].Value <<= mnPresetClass;
+}
+
+mxNode->setUserData( aUserData );
 }
 
 void CustomAnimationEffect::setNodeType( sal_Int16 nNodeType )
 {
-if( mnNodeType != nNodeType )
+if( mnNodeType == nNodeType )
+return;
+
+mnNodeType = nNodeType;
+if( !mxNode.is() )
+return;
+
+// first try to find a "node-type" entry in the user data
+// and change i

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

[Libreoffice Gerrit user]

 desktop/source/app/dispatchwatcher.cxx |9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

New commits:
commit d9f9a9e56d558174cb5ff96c3bb78a5692a26570
Author: Mike Kaganski 
AuthorDate: Fri Feb 15 06:38:32 2019 +0300
Commit: Stephan Bergmann 
CommitDate: Fri Feb 15 11:10:19 2019 +0100

tdf#123474: use INetURLObject methods to construct valid URI

This ensures that no extra slashes are added to the path when it
already ends with a slash; for Windows drive root path (e.g. C:\)
the trailing slash is always kept to not change the meaning to
"current path on the drive", which is different from "root of the
drive". Our IsValidFilePath does not allow more than one slash
after .

Change-Id: Ife3cd9e146573a0c278834f795f0d7318c2d303a
Reviewed-on: https://gerrit.libreoffice.org/67850
Reviewed-by: Stephan Bergmann 
Tested-by: Stephan Bergmann 

diff --git a/desktop/source/app/dispatchwatcher.cxx 
b/desktop/source/app/dispatchwatcher.cxx
index 3a8b2d9961a0..872d98333982 100644
--- a/desktop/source/app/dispatchwatcher.cxx
+++ b/desktop/source/app/dispatchwatcher.cxx
@@ -575,10 +575,13 @@ bool DispatchWatcher::executeDispatchRequests( const 
std::vector fileForCat;
 if( aDispatchRequest.aRequestType == REQUEST_CAT )
___
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.0' - vbahelper/source

[Libreoffice Gerrit user]

 vbahelper/source/vbahelper/vbadocumentsbase.cxx |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit bec67a7f0e15eb1c342e3e2fb9104ab0f3502412
Author: Tor Lillqvist 
AuthorDate: Fri Feb 15 11:31:00 2019 +0200
Commit: Tor Lillqvist 
CommitDate: Fri Feb 15 11:35:21 2019 +0200

Add a FIXME note

Change-Id: Iedda7ca9cff1bda763845e665e0e21656b253793

diff --git a/vbahelper/source/vbahelper/vbadocumentsbase.cxx 
b/vbahelper/source/vbahelper/vbadocumentsbase.cxx
index 8dcee9b817f2..b948cc44bf94 100644
--- a/vbahelper/source/vbahelper/vbadocumentsbase.cxx
+++ b/vbahelper/source/vbahelper/vbadocumentsbase.cxx
@@ -287,6 +287,12 @@ uno::Any VbaDocumentsBase::openDocument( const OUString& 
rFileName, const uno::A
 }
 }
 
+// FIXME: Should we add an AsTemplate property with value false
+// here, to be absolutely sure it doesn't (for some mysterious
+// reason) open the document as a template (as happens for a .rtf
+// file at a customer)? Nah, let's see first if I can figure out
+// what the mysterious reason is...
+
 uno::Reference< lang::XComponent > xComponent = 
xDesktop->loadComponentFromURL( aURL,
 "_default" ,
 frame::FrameSearchFlag::CREATE,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Libreoffice Gerrit user]

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

New commits:
commit 7ef63095efb3987707a173cca27aaaf5edcc402c
Author: Stephan Bergmann 
AuthorDate: Fri Feb 15 10:14:37 2019 +0100
Commit: Gerrit Code Review 
CommitDate: Fri Feb 15 11:25:38 2019 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  - tdf#121532 Don't use non-standard `echo -n`

At least the version of echo used to build TDF's LO 6.2.0.3 release 
apparently
doesn't understand that non-standard option and printed out "-n" 
verbatim,
generating a broken languages.js.  (Though my local macOS 10.14.3 
/bin/echo does
understand that option.)

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

diff --git a/helpcontent2 b/helpcontent2
index 96e5f8c50592..8986dec8229c 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 96e5f8c5059270f9d17b0151a90b6893eb3f433d
+Subproject commit 8986dec8229cf31ccfadb61e6e90c905f7033ac7
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 vbahelper/source/vbahelper/vbadocumentsbase.cxx |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 58ce8be9f96f812ac7ac274c1b2ee30a3283b633
Author: Tor Lillqvist 
AuthorDate: Fri Feb 15 11:31:00 2019 +0200
Commit: Tor Lillqvist 
CommitDate: Fri Feb 15 11:36:07 2019 +0200

Add a FIXME note

Change-Id: Iedda7ca9cff1bda763845e665e0e21656b253793

diff --git a/vbahelper/source/vbahelper/vbadocumentsbase.cxx 
b/vbahelper/source/vbahelper/vbadocumentsbase.cxx
index fc20c882f092..78c28c8c5d8b 100644
--- a/vbahelper/source/vbahelper/vbadocumentsbase.cxx
+++ b/vbahelper/source/vbahelper/vbadocumentsbase.cxx
@@ -285,6 +285,12 @@ uno::Any VbaDocumentsBase::openDocument( const OUString& 
rFileName, const uno::A
 }
 }
 
+// FIXME: Should we add an AsTemplate property with value false
+// here, to be absolutely sure it doesn't (for some mysterious
+// reason) open the document as a template (as happens for a .rtf
+// file at a customer)? Nah, let's see first if I can figure out
+// what the mysterious reason is...
+
 uno::Reference< lang::XComponent > xComponent = 
xDesktop->loadComponentFromURL( aURL,
 "_default" ,
 frame::FrameSearchFlag::CREATE,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sw/source/ui/vba/vbaapplication.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 6ead817bb830b332e16e0c2ab8f39ac7ab440152
Author: Tor Lillqvist 
AuthorDate: Wed Feb 13 14:41:46 2019 +0200
Commit: Tor Lillqvist 
CommitDate: Fri Feb 15 11:33:41 2019 +0200

Interpret the parameter of WordBasic.FileClose() more correctly

In particular, the value 2 means "do not save".

Change-Id: I9788d201f8ecfcc016a12aa2088552ee994e1c17

diff --git a/sw/source/ui/vba/vbaapplication.cxx 
b/sw/source/ui/vba/vbaapplication.cxx
index 98236bacec81..767709ad40c4 100644
--- a/sw/source/ui/vba/vbaapplication.cxx
+++ b/sw/source/ui/vba/vbaapplication.cxx
@@ -554,8 +554,8 @@ SwWordBasic::FileClose( const css::uno::Any& Save )
 {
 uno::Reference< frame::XModel > xModel( mpApp->getCurrentDocument(), 
uno::UNO_SET_THROW );
 
-bool bSave = false;
-if (Save.hasValue() && (Save >>= bSave) && bSave)
+sal_Int16 nSave = false;
+if (Save.hasValue() && (Save >>= nSave) && (nSave == 0 || nSave == 1))
 FileSave();
 
 // FIXME: Here I would much prefer to call VbaDocumentBase::Close() but 
not sure how to get at
___
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.0' - sw/source

[Libreoffice Gerrit user]

 sw/source/ui/vba/vbaapplication.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit fb797eb41bf9b26261c4d9fe7a38ba635b80a20c
Author: Tor Lillqvist 
AuthorDate: Wed Feb 13 14:41:46 2019 +0200
Commit: Tor Lillqvist 
CommitDate: Fri Feb 15 11:32:34 2019 +0200

Interpret the parameter of WordBasic.FileClose() more correctly

In particular, the value 2 means "do not save".

Change-Id: I9788d201f8ecfcc016a12aa2088552ee994e1c17

diff --git a/sw/source/ui/vba/vbaapplication.cxx 
b/sw/source/ui/vba/vbaapplication.cxx
index 7341bd487fbd..58234632aa3f 100644
--- a/sw/source/ui/vba/vbaapplication.cxx
+++ b/sw/source/ui/vba/vbaapplication.cxx
@@ -556,8 +556,8 @@ SwWordBasic::FileClose( const css::uno::Any& Save )
 {
 uno::Reference< frame::XModel > xModel( mpApp->getCurrentDocument(), 
uno::UNO_SET_THROW );
 
-bool bSave = false;
-if (Save.hasValue() && (Save >>= bSave) && bSave)
+sal_Int16 nSave = false;
+if (Save.hasValue() && (Save >>= nSave) && (nSave == 0 || nSave == 1))
 FileSave();
 
 // FIXME: Here I would much prefer to call VbaDocumentBase::Close() but 
not sure how to get at
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sd/source/ui/sidebar/MasterPageContainer.cxx |   58 +-
 sd/source/ui/sidebar/MasterPageObserver.cxx  |  138 ++--
 sd/source/ui/sidebar/MasterPagesSelector.cxx |   56 +-
 sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx |   49 -
 sd/source/ui/slideshow/PaneHider.cxx |5 
 sd/source/ui/slideshow/SlideShowRestarter.cxx|   78 +-
 sd/source/ui/slideshow/showwin.cxx   |   24 
 sd/source/ui/slideshow/slideshow.cxx |  278 -
 sd/source/ui/slideshow/slideshowimpl.cxx |  640 +++
 sd/source/ui/slideshow/slideshowviewimpl.cxx |   50 -
 10 files changed, 698 insertions(+), 678 deletions(-)

New commits:
commit 954397df73b182e105e3ae5dff40c36a96239b08
Author: Noel Grandin 
AuthorDate: Thu Feb 14 09:11:43 2019 +0200
Commit: Noel Grandin 
CommitDate: Fri Feb 15 07:51:58 2019 +0100

loplugin:flatten in sd/source/ui/sidebar

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

diff --git a/sd/source/ui/sidebar/MasterPageContainer.cxx 
b/sd/source/ui/sidebar/MasterPageContainer.cxx
index 1368400e6626..f96cb090ad25 100644
--- a/sd/source/ui/sidebar/MasterPageContainer.cxx
+++ b/sd/source/ui/sidebar/MasterPageContainer.cxx
@@ -264,24 +264,24 @@ void MasterPageContainer::AcquireToken (Token aToken)
 void MasterPageContainer::ReleaseToken (Token aToken)
 {
 SharedMasterPageDescriptor pDescriptor = mpImpl->GetDescriptor(aToken);
-if (pDescriptor.get() != nullptr)
-{
-OSL_ASSERT(pDescriptor->mnUseCount>0);
---pDescriptor->mnUseCount;
-if (pDescriptor->mnUseCount <= 0)
-{
-switch (pDescriptor->meOrigin)
-{
-case DEFAULT:
-case TEMPLATE:
-default:
-break;
+if (pDescriptor.get() == nullptr)
+return;
 
-case MASTERPAGE:
-mpImpl->ReleaseDescriptor(aToken);
-break;
-}
-}
+OSL_ASSERT(pDescriptor->mnUseCount>0);
+--pDescriptor->mnUseCount;
+if (pDescriptor->mnUseCount > 0)
+return;
+
+switch (pDescriptor->meOrigin)
+{
+case DEFAULT:
+case TEMPLATE:
+default:
+break;
+
+case MASTERPAGE:
+mpImpl->ReleaseDescriptor(aToken);
+break;
 }
 }
 
@@ -522,21 +522,21 @@ void MasterPageContainer::Implementation::LateInit()
 {
 const ::osl::MutexGuard aGuard (maMutex);
 
-if (meInitializationState == NOT_INITIALIZED)
-{
-meInitializationState = INITIALIZING;
+if (meInitializationState != NOT_INITIALIZED)
+return;
 
-OSL_ASSERT(Instance().get()==this);
-mpRequestQueue.reset(MasterPageContainerQueue::Create(
-
std::shared_ptr(Instance(;
+meInitializationState = INITIALIZING;
 
-mpFillerTask = ::sd::tools::TimerBasedTaskExecution::Create(
-std::shared_ptr(new 
MasterPageContainerFiller(*this)),
-5,
-50);
+OSL_ASSERT(Instance().get()==this);
+mpRequestQueue.reset(MasterPageContainerQueue::Create(
+
std::shared_ptr(Instance(;
 
-meInitializationState = INITIALIZED;
-}
+mpFillerTask = ::sd::tools::TimerBasedTaskExecution::Create(
+std::shared_ptr(new 
MasterPageContainerFiller(*this)),
+5,
+50);
+
+meInitializationState = INITIALIZED;
 }
 
 void MasterPageContainer::Implementation::AddChangeListener (const 
Link& rLink)
diff --git a/sd/source/ui/sidebar/MasterPageObserver.cxx 
b/sd/source/ui/sidebar/MasterPageObserver.cxx
index d13a418fc918..eee288d021c3 100644
--- a/sd/source/ui/sidebar/MasterPageObserver.cxx
+++ b/sd/source/ui/sidebar/MasterPageObserver.cxx
@@ -186,24 +186,24 @@ void MasterPageObserver::Implementation::AddEventListener 
(
 if (::std::find (
 maListeners.begin(),
 maListeners.end(),
-rEventListener) == maListeners.end())
-{
-maListeners.push_back (rEventListener);
+rEventListener) != maListeners.end())
+return;
+
+maListeners.push_back (rEventListener);
 
-// Tell the new listener about all the master pages that are
-// currently in use.
-for (const auto& rDocument : maUsedMasterPages)
+// Tell the new listener about all the master pages that are
+// currently in use.
+for (const auto& rDocument : maUsedMasterPages)
+{
+::std::set::reverse_iterator aNameIterator;
+for (aNameIterator=rDocument.second.rbegin();
+ aNameIterator!=rDocument.second.rend();
+ ++aNameIterator)
 {
-::std::set::reverse_iterator aNameIterator;
-for (aNameIterator=rDocument.second.rbegin();
- aNameIterator!=rDocument.second.rend();
- ++aNameIterator)
-   

Re: Windows Unit TestSwLayoutWriter::testBtlrCell Failing

[Miklos Vajna via LibreOffice]

Hi Luke,

On Thu, Feb 14, 2019 at 10:53:36PM +, Luke Benes  
wrote:
> Would you like any more debug info?

I don't have any quick ideas; I've disabled the test on Windows[1] till
it's clear how to fix this.

Regards,

Miklos

[1] https://gerrit.libreoffice.org/67856


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

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

[Libreoffice Gerrit user]

 sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx|   30 -
 sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx |   32 -
 sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx   |   84 
++--
 sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx   |   24 -
 sd/source/ui/slidesorter/controller/SlideSorterController.cxx|  162 
-
 sd/source/ui/slidesorter/controller/SlsClipboard.cxx |  108 
+++---
 sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx   |   94 
++---
 sd/source/ui/slidesorter/controller/SlsFocusManager.cxx  |  110 
+++---
 sd/source/ui/slidesorter/controller/SlsInsertionIndicatorHandler.cxx |   35 --
 sd/source/ui/slidesorter/controller/SlsListener.cxx  |  136 

 sd/source/ui/slidesorter/controller/SlsPageSelector.cxx  |   88 
++---
 sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx |  106 
+++---
 sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx  |   54 +--
 sd/source/ui/slidesorter/controller/SlsSlotManager.cxx   |  170 
+-
 sd/source/ui/slidesorter/controller/SlsVisibleAreaManager.cxx|   22 -
 sd/source/ui/slidesorter/shell/SlideSorter.cxx   |   36 +-
 sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx  |   46 +-
 sd/source/ui/slidesorter/view/SlideSorterView.cxx|  144 

 sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx  |   38 +-
 sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx   |  108 
+++---
 sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx   |   56 +--
 sd/source/ui/slidesorter/view/SlsToolTip.cxx |  124 
+++
 22 files changed, 902 insertions(+), 905 deletions(-)

New commits:
commit 8f6a170e4bbb5d0a0bf06d26560189e4ca7ecfb0
Author: Noel Grandin 
AuthorDate: Thu Feb 14 09:11:13 2019 +0200
Commit: Noel Grandin 
CommitDate: Fri Feb 15 08:45:07 2019 +0100

loplugin:flatten in sd/source/ui/slidesorter

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

diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx 
b/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx
index 01659b9211aa..ee311d1c13e4 100644
--- a/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx
@@ -490,27 +490,27 @@ inline sal_Int32 BitmapCache::CacheEntry::GetMemorySize() 
const
 
 void BitmapCache::CacheEntry::Compress (const 
std::shared_ptr& rpCompressor)
 {
-if ( ! maPreview.IsEmpty())
+if (  maPreview.IsEmpty())
+return;
+
+if (mpReplacement == nullptr)
 {
-if (mpReplacement == nullptr)
-{
-mpReplacement = rpCompressor->Compress(maPreview);
+mpReplacement = rpCompressor->Compress(maPreview);
 
 #ifdef DEBUG_SD_SLSBITMAPCACHE
-sal_uInt32 nOldSize (maPreview.GetSizeBytes());
-sal_uInt32 nNewSize (mpReplacement.get()!=NULL ? 
mpReplacement->GetMemorySize() : 0);
-if (nOldSize == 0)
-nOldSize = 1;
-sal_Int32 nRatio (100L * nNewSize / nOldSize);
-SAL_INFO("sd.sls", OSL_THIS_FUNC << ": compressing bitmap for " << 
%x << " from " << nOldSize << " to " << nNewSize << " bytes (" << nRatio << 
"%)");
+sal_uInt32 nOldSize (maPreview.GetSizeBytes());
+sal_uInt32 nNewSize (mpReplacement.get()!=NULL ? 
mpReplacement->GetMemorySize() : 0);
+if (nOldSize == 0)
+nOldSize = 1;
+sal_Int32 nRatio (100L * nNewSize / nOldSize);
+SAL_INFO("sd.sls", OSL_THIS_FUNC << ": compressing bitmap for " << %x 
<< " from " << nOldSize << " to " << nNewSize << " bytes (" << nRatio << "%)");
 #endif
 
-mpCompressor = rpCompressor;
-}
-
-maPreview.SetEmpty();
-maMarkedPreview.SetEmpty();
+mpCompressor = rpCompressor;
 }
+
+maPreview.SetEmpty();
+maMarkedPreview.SetEmpty();
 }
 
 inline void BitmapCache::CacheEntry::Decompress()
diff --git a/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx 
b/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx
index e1b04310893f..fc45c039f56d 100644
--- a/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx
@@ -166,24 +166,24 @@ 
CacheCompactionByCompression::CacheCompactionByCompression (
 
 void CacheCompactionByCompression::Run()
 {
-if (mrCache.GetSize() > mnMaximalCacheSize)
+if (mrCache.GetSize() <= mnMaximalCacheSize)
+return;
+
+SAL_INFO("sd.sls", OSL_THIS_FUNC << ": bitmap cache uses to much space: " 
<< mrCache.GetSize() << " > " << mnMaximalCacheSize);
+
+::std::unique_ptr< ::sd::slidesorter::cache::BitmapCache::CacheIndex> 
pIndex (
+

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

[Libreoffice Gerrit user]

 chart2/qa/extras/chart2export.cxx|   19 +++
 chart2/qa/extras/data/xlsx/testErrorBarProp.xlsx |binary
 oox/source/export/chartexport.cxx|2 ++
 3 files changed, 21 insertions(+)

New commits:
commit b89f239aa9d3d4660380bbd0c893aecde0986032
Author: Balazs Varga 
AuthorDate: Thu Feb 14 16:30:43 2019 +0100
Commit: László Németh 
CommitDate: Fri Feb 15 07:30:09 2019 +0100

tdf#97575 Chart OOXML: Export ShapeProps of Error Bars

Export the shapeProps (fillstyle, linestyle, linewidth,
linecolor etc.) of the Error Bars to OOXML.

Change-Id: Iff74fa463fdd0fb6ed95e4d1bf0d3e906349860c
Reviewed-on: https://gerrit.libreoffice.org/67825
Tested-by: Jenkins
Reviewed-by: László Németh 

diff --git a/chart2/qa/extras/chart2export.cxx 
b/chart2/qa/extras/chart2export.cxx
index b16e773ab776..8671a4771e21 100644
--- a/chart2/qa/extras/chart2export.cxx
+++ b/chart2/qa/extras/chart2export.cxx
@@ -40,6 +40,7 @@ protected:
 public:
 Chart2ExportTest() : ChartTest() {}
 void testErrorBarXLSX();
+void testErrorBarPropXLSX();
 void testTrendline();
 void testTrendlineOOXML();
 void testTrendlineXLS();
@@ -130,6 +131,7 @@ public:
 
 CPPUNIT_TEST_SUITE(Chart2ExportTest);
 CPPUNIT_TEST(testErrorBarXLSX);
+CPPUNIT_TEST(testErrorBarPropXLSX);
 CPPUNIT_TEST(testTrendline);
 CPPUNIT_TEST(testTrendlineOOXML);
 CPPUNIT_TEST(testTrendlineXLS);
@@ -495,6 +497,23 @@ void Chart2ExportTest::testErrorBarXLSX()
 }
 }
 
+void Chart2ExportTest::testErrorBarPropXLSX()
+{
+load("/chart2/qa/extras/data/xlsx/", "testErrorBarProp.xlsx");
+xmlDocPtr pXmlDoc = parseExport("xl/charts/chart","Calc Office Open XML");
+CPPUNIT_ASSERT(pXmlDoc);
+
+// test y error bars property
+assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser/c:errBars[1]/c:errDir", 
"val", "y");
+assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser/c:errBars[1]/c:spPr/a:ln",
 "w", "12600");
+assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser/c:errBars[1]/c:spPr/a:ln/a:solidFill/a:srgbClr",
 "val", "ff");
+
+// test x error bars property
+assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser/c:errBars[2]/c:errDir", 
"val", "x");
+assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser/c:errBars[2]/c:spPr/a:ln",
 "w", "9360");
+assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser/c:errBars[2]/c:spPr/a:ln/a:solidFill/a:srgbClr",
 "val", "595959");
+}
+
 // This method tests the preservation of properties for trendlines / 
regression curves
 // in an export -> import cycle using different file formats - ODS, XLS and 
XLSX.
 void Chart2ExportTest::testTrendline()
diff --git a/chart2/qa/extras/data/xlsx/testErrorBarProp.xlsx 
b/chart2/qa/extras/data/xlsx/testErrorBarProp.xlsx
new file mode 100755
index ..ac9dde9b79b6
Binary files /dev/null and b/chart2/qa/extras/data/xlsx/testErrorBarProp.xlsx 
differ
diff --git a/oox/source/export/chartexport.cxx 
b/oox/source/export/chartexport.cxx
index b1c437b53dfe..47c30b1ba569 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -3885,6 +3885,8 @@ void ChartExport::exportErrorBar(const Reference< 
XPropertySet>& xErrorBarProps,
 FSEND );
 }
 
+exportShapeProps( xErrorBarProps );
+
 pFS->endElement( FSNS( XML_c, XML_errBars) );
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sw/qa/extras/layout/layout.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9e922ced246d2c4d4554d66ba97eae1d2a02847f
Author: Miklos Vajna 
AuthorDate: Fri Feb 15 08:42:48 2019 +0100
Commit: Miklos Vajna 
CommitDate: Fri Feb 15 09:37:04 2019 +0100

CppunitTest_sw_layoutwriter: disable testBtlrCell() on Windows, too

Till it's clear why it has unexpected values.

Report from mailing list:

> Test name: SwLayoutWriter::testBtlrCell
> equality assertion failed
> - Expected: 2707
> - Actual  : 2710
> - In <>, attribute 'y' of '//textarray[1]' incorrect value.

Change-Id: Ic914f513df544dcf472b0870a3936f87d876c76b
Reviewed-on: https://gerrit.libreoffice.org/67856
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins

diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx
index 1c8ca7aa6385..bd720372dfb1 100644
--- a/sw/qa/extras/layout/layout.cxx
+++ b/sw/qa/extras/layout/layout.cxx
@@ -2805,7 +2805,7 @@ void SwLayoutWriter::testBtlrCell()
 // doc model).
 assertXPath(pXmlDoc, "//font[1]", "orientation", "900");
 
-#ifndef MACOSX // macOS fails with actual == 2662 for some reason.
+#if !defined(MACOSX) && !defined(_WIN32) // macOS fails with actual == 2662 
for some reason.
 // Without the accompanying fix in place, this test would have failed with 
'Expected: 1915;
 // Actual  : 1756', i.e. the AAA text was too close to the left cell 
border due to an ascent vs
 // descent mismatch when calculating the baseline offset of the text 
portion.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sc/qa/extras/anchor.cxx   |   38 ++
 solenv/clang-format/blacklist |1 -
 2 files changed, 18 insertions(+), 21 deletions(-)

New commits:
commit 298284f4a6578aefc4268b7f4b5de6c2e4203465
Author: Samuel Mehrbrodt 
AuthorDate: Thu Feb 14 18:34:06 2019 +0100
Commit: Samuel Mehrbrodt 
CommitDate: Fri Feb 15 08:01:22 2019 +0100

Format anchor.cxx with clang-format

It has nearly correct formatting already, lets keep that.

Change-Id: I0b3b7baf69655cb3241ba039b181b0d8262a3f55
Reviewed-on: https://gerrit.libreoffice.org/67845
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt 

diff --git a/sc/qa/extras/anchor.cxx b/sc/qa/extras/anchor.cxx
index 92e09a0c2f25..221a6da25289 100644
--- a/sc/qa/extras/anchor.cxx
+++ b/sc/qa/extras/anchor.cxx
@@ -7,10 +7,10 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include 
+#include 
 #include 
 #include 
-#include 
+#include 
 
 #include 
 #include 
@@ -18,19 +18,19 @@
 #include 
 #include 
 
-#include 
+#include 
 #include 
-#include 
-#include 
 #include 
-#include 
+#include 
+#include 
+#include 
 
 #include 
 
 using namespace css;
 
-namespace sc_apitest {
-
+namespace sc_apitest
+{
 class ScAnchorTest : public CalcUnoApiTest
 {
 public:
@@ -51,9 +51,9 @@ public:
 CPPUNIT_TEST(testCopyColumnWithImages);
 CPPUNIT_TEST(testCutWithImages);
 CPPUNIT_TEST_SUITE_END();
-private:
 
-uno::Reference< lang::XComponent > mxComponent;
+private:
+uno::Reference mxComponent;
 };
 
 ScAnchorTest::ScAnchorTest()
@@ -61,13 +61,12 @@ ScAnchorTest::ScAnchorTest()
 {
 }
 
-
 void ScAnchorTest::testUndoAnchor()
 {
 OUString aFileURL;
 createFileURL("document_with_linked_graphic.ods", aFileURL);
 // open the document with graphic included
-uno::Reference< css::lang::XComponent > xComponent = 
loadFromDesktop(aFileURL);
+uno::Reference xComponent = 
loadFromDesktop(aFileURL);
 CPPUNIT_ASSERT(xComponent.is());
 
 // Get the document model
@@ -82,7 +81,7 @@ void ScAnchorTest::testUndoAnchor()
 ScDrawLayer* pDrawLayer = rDoc.GetDrawLayer();
 CPPUNIT_ASSERT(pDrawLayer);
 
-const SdrPage *pPage = pDrawLayer->GetPage(0);
+const SdrPage* pPage = pDrawLayer->GetPage(0);
 CPPUNIT_ASSERT(pPage);
 
 SdrGrafObj* pObject = dynamic_cast(pPage->GetObj(0));
@@ -103,7 +102,7 @@ void ScAnchorTest::testUndoAnchor()
 
 // Select graphic object
 pDrawView->MarkNextObj();
-CPPUNIT_ASSERT(pDrawView->AreObjectsMarked() );
+CPPUNIT_ASSERT(pDrawView->AreObjectsMarked());
 
 // Set Cell Anchor
 ScDrawLayer::SetCellAnchoredFromPosition(*pObject, rDoc, 0, false);
@@ -164,12 +163,12 @@ void ScAnchorTest::testUndoAnchor()
 
 void ScAnchorTest::testTdf76183()
 {
-uno::Reference< lang::XComponent > xComponent = 
loadFromDesktop("private:factory/scalc");
+uno::Reference xComponent = 
loadFromDesktop("private:factory/scalc");
 SfxObjectShell* pFoundShell = 
SfxObjectShell::GetShellFromComponent(xComponent);
 ScDocShell* pDocSh = dynamic_cast(pFoundShell);
 ScDocument& rDoc = pDocSh->GetDocument();
 ScDrawLayer* pDrawLayer = rDoc.GetDrawLayer();
-SdrPage *pPage = pDrawLayer->GetPage(0);
+SdrPage* pPage = pDrawLayer->GetPage(0);
 
 // Add a circle somewhere below first row.
 const tools::Rectangle aOrigRect = tools::Rectangle(1000, 1000, 1200, 
1200);
@@ -199,7 +198,7 @@ void ScAnchorTest::testODFAnchorTypes()
 OUString aFileURL;
 createFileURL("3AnchorTypes.ods", aFileURL);
 // open the document with graphic included
-uno::Reference< css::lang::XComponent > xComponent = 
loadFromDesktop(aFileURL);
+uno::Reference xComponent = 
loadFromDesktop(aFileURL);
 CPPUNIT_ASSERT(xComponent.is());
 
 // Get the document model
@@ -214,7 +213,7 @@ void ScAnchorTest::testODFAnchorTypes()
 ScDrawLayer* pDrawLayer = rDoc.GetDrawLayer();
 CPPUNIT_ASSERT(pDrawLayer);
 
-const SdrPage *pPage = pDrawLayer->GetPage(0);
+const SdrPage* pPage = pDrawLayer->GetPage(0);
 CPPUNIT_ASSERT(pPage);
 
 // Check 1st object: Page anchored
@@ -229,7 +228,7 @@ void ScAnchorTest::testODFAnchorTypes()
 anchorType = ScDrawLayer::GetAnchorType(*pObject);
 CPPUNIT_ASSERT_EQUAL(SCA_CELL_RESIZE, anchorType);
 
- // Check 3rd object: Cell anchored
+// Check 3rd object: Cell anchored
 pObject = dynamic_cast(pPage->GetObj(2));
 CPPUNIT_ASSERT(pObject);
 anchorType = ScDrawLayer::GetAnchorType(*pObject);
@@ -381,7 +380,6 @@ void ScAnchorTest::tearDown()
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(ScAnchorTest);
-
 }
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist
index 9e104cf16bbd..9378cca7a50c 100644
--- a/solenv/clang-format/blacklist
+++ b/solenv/clang-format/blacklist
@@ -10118,7 +10118,6 @@ sc/inc/waitoff.hxx
 sc/inc/warnpassword.hxx
 sc/inc/xmlwrap.hxx
 sc/inc/zforauto.hxx
-sc/qa/extras/anchor.cxx
 

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

[Libreoffice Gerrit user]

 vcl/source/filter/png/PngImageReader.cxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 153c40adacbe1b6b4e8c205f02afabf22fe3c0bf
Author: Andrea Gelmini 
AuthorDate: Thu Feb 14 20:49:27 2019 +
Commit: Julien Nabet 
CommitDate: Fri Feb 15 07:08:33 2019 +0100

Fix typo in code

It passed "make check" on Linux

Change-Id: I81d83b9053329a19af4f478d21f8c452dcf39538
Reviewed-on: https://gerrit.libreoffice.org/67849
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/vcl/source/filter/png/PngImageReader.cxx 
b/vcl/source/filter/png/PngImageReader.cxx
index b4778fe5df63..2c83f890e91a 100644
--- a/vcl/source/filter/png/PngImageReader.cxx
+++ b/vcl/source/filter/png/PngImageReader.cxx
@@ -136,8 +136,8 @@ bool reader(SvStream& rStream, BitmapEx& rBitmapEx)
 size_t aRowSizeBytes = png_get_rowbytes(pPng, pInfo);
 
 BitmapScopedWriteAccess pWriteAccess(aBitmap);
-ScanlineFormat eFromat = pWriteAccess->GetScanlineFormat();
-if (eFromat == ScanlineFormat::N24BitTcBgr)
+ScanlineFormat eFormat = pWriteAccess->GetScanlineFormat();
+if (eFormat == ScanlineFormat::N24BitTcBgr)
 png_set_bgr(pPng);
 
 std::vector aRow(aRowSizeBytes, 0);
@@ -166,8 +166,8 @@ bool reader(SvStream& rStream, BitmapEx& rBitmapEx)
 BitmapScopedWriteAccess pWriteAccess(aBitmap);
 AlphaScopedWriteAccess pWriteAccessAlpha(aBitmapAlpha);
 
-ScanlineFormat eFromat = pWriteAccess->GetScanlineFormat();
-if (eFromat == ScanlineFormat::N24BitTcBgr)
+ScanlineFormat eFormat = pWriteAccess->GetScanlineFormat();
+if (eFormat == ScanlineFormat::N24BitTcBgr)
 png_set_bgr(pPng);
 
 std::vector aRow(aRowSizeBytes, 0);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sc/qa/extras/anchor.cxx  |   62 +++
 sc/source/core/data/drwlayer.cxx |   15 ++---
 2 files changed, 73 insertions(+), 4 deletions(-)

New commits:
commit e756b6f310f309ac29bb2bce92309bb74edd788d
Author: Samuel Mehrbrodt 
AuthorDate: Thu Feb 14 10:34:35 2019 +0100
Commit: Samuel Mehrbrodt 
CommitDate: Fri Feb 15 08:00:13 2019 +0100

tdf#122982 Remove image from cell when cutting the cell

Change-Id: Idd73dcc88a8cd76eb4011bb26efdd5c712d16e5e
Reviewed-on: https://gerrit.libreoffice.org/67844
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt 

diff --git a/sc/qa/extras/anchor.cxx b/sc/qa/extras/anchor.cxx
index 35cd9a567d35..92e09a0c2f25 100644
--- a/sc/qa/extras/anchor.cxx
+++ b/sc/qa/extras/anchor.cxx
@@ -23,6 +23,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 
@@ -41,12 +42,14 @@ public:
 void testTdf76183();
 void testODFAnchorTypes();
 void testCopyColumnWithImages();
+void testCutWithImages();
 
 CPPUNIT_TEST_SUITE(ScAnchorTest);
 CPPUNIT_TEST(testUndoAnchor);
 CPPUNIT_TEST(testTdf76183);
 CPPUNIT_TEST(testODFAnchorTypes);
 CPPUNIT_TEST(testCopyColumnWithImages);
+CPPUNIT_TEST(testCutWithImages);
 CPPUNIT_TEST_SUITE_END();
 private:
 
@@ -308,6 +311,65 @@ void ScAnchorTest::testCopyColumnWithImages()
 pDocSh->DoClose();
 }
 
+void ScAnchorTest::testCutWithImages()
+{
+OUString aFileURL;
+createFileURL("3AnchorTypes.ods", aFileURL);
+// open the document with graphic included
+uno::Reference xComponent = 
loadFromDesktop(aFileURL);
+CPPUNIT_ASSERT(xComponent.is());
+
+// Get the document model
+SfxObjectShell* pFoundShell = 
SfxObjectShell::GetShellFromComponent(xComponent);
+CPPUNIT_ASSERT_MESSAGE("Failed to access document shell", pFoundShell);
+
+ScDocShell* pDocSh = dynamic_cast(pFoundShell);
+CPPUNIT_ASSERT(pDocSh);
+
+ScDocument* pDoc = &(pDocSh->GetDocument());
+ScDrawLayer* pDrawLayer = pDoc->GetDrawLayer();
+CPPUNIT_ASSERT(pDrawLayer);
+
+// Get the document controller
+ScTabViewShell* pViewShell = pDocSh->GetBestViewShell(false);
+CPPUNIT_ASSERT(pViewShell != nullptr);
+
+// Cut whole column
+{
+// Cut source range
+ScRange aSrcRange;
+aSrcRange.Parse("A1:A11", pDoc, pDoc->GetAddressConvention());
+pViewShell->GetViewData().GetMarkData().SetMarkArea(aSrcRange);
+pViewShell->GetViewData().GetView()->CutToClip();
+
+std::map> aRowObjects
+= pDrawLayer->GetObjectsAnchoredToRange(0, 0, 0, 11);
+
+// Images should have been removed from the cells
+CPPUNIT_ASSERT_EQUAL_MESSAGE("There should be no image anchored to 
A3", 0,
+ static_cast(aRowObjects[2].size()));
+CPPUNIT_ASSERT_EQUAL_MESSAGE("There should be no image anchored to 
A11", 0,
+ static_cast(aRowObjects[10].size()));
+}
+
+// Cut individual cells
+{
+// Cut source cells
+ScRange aSrcRange;
+aSrcRange.Parse("A3:B3", pDoc, pDoc->GetAddressConvention());
+pViewShell->GetViewData().GetMarkData().SetMarkArea(aSrcRange);
+pViewShell->GetViewData().GetView()->CutToClip();
+
+// Image should have been removed from the cell
+std::map> aRowObjects
+= pDrawLayer->GetObjectsAnchoredToRange(0, 0, 2, 2);
+CPPUNIT_ASSERT_EQUAL_MESSAGE("There should be no image anchored to 
A3", 0,
+ static_cast(aRowObjects[2].size()));
+}
+
+pDocSh->DoClose();
+}
+
 void ScAnchorTest::tearDown()
 {
 if (mxComponent.is())
diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx
index fa7a784fbb4a..259e76fe08fa 100644
--- a/sc/source/core/data/drwlayer.cxx
+++ b/sc/source/core/data/drwlayer.cxx
@@ -1446,11 +1446,18 @@ void ScDrawLayer::DeleteObjectsInSelection( const 
ScMarkData& rMark )
 if (!IsNoteCaption( pObject ))
 {
 tools::Rectangle aObjRect = 
pObject->GetCurrentBoundRect();
-if ( aMarkBound.IsInside( aObjRect ) )
+ScRange aRange = pDoc->GetRange(nTab, aObjRect);
+bool bObjectInMarkArea
+= aMarkBound.IsInside(aObjRect) && 
rMark.IsAllMarked(aRange);
+const ScDrawObjData* pObjData = 
ScDrawLayer::GetObjData(pObject);
+ScAnchorType aAnchorType = 
ScDrawLayer::GetAnchorType(*pObject);
+bool bObjectAnchoredToMarkedCell
+= ((aAnchorType == SCA_CELL || aAnchorType == 
SCA_CELL_RESIZE)
+   && rMark.IsCellMarked(pObjData->maStart.Col(),
+ pObjData->maStart.Row()));
+if (bObjectInMarkArea || 

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

[Libreoffice Gerrit user]

 sd/source/ui/table/TableDesignPane.cxx |  123 +--
 sd/source/ui/table/tablefunction.cxx   |   73 +-
 sd/source/ui/table/tableobjectbar.cxx  |  184 ++---
 sd/source/ui/tools/ConfigurationAccess.cxx |   28 
 sd/source/ui/tools/EventMultiplexer.cxx|  160 ++--
 sd/source/ui/tools/PreviewRenderer.cxx |   48 -
 sd/source/ui/tools/PropertySet.cxx |   28 
 sd/source/ui/tools/TimerBasedTaskExecution.cxx |   66 -
 sd/source/ui/unoidl/DrawController.cxx |  200 ++---
 sd/source/ui/unoidl/SdUnoDrawView.cxx  |   48 -
 sd/source/ui/unoidl/unolayer.cxx   |  114 +--
 sd/source/ui/unoidl/unomodel.cxx   |  840 -
 sd/source/ui/unoidl/unoobj.cxx |  158 ++--
 sd/source/ui/unoidl/unopage.cxx|  458 ++---
 sd/source/ui/view/DocumentRenderer.cxx |  186 ++---
 sd/source/ui/view/FormShellManager.cxx |   90 +-
 sd/source/ui/view/MediaObjectBar.cxx   |   52 -
 sd/source/ui/view/Outliner.cxx |  412 ++--
 sd/source/ui/view/OutlinerIterator.cxx |   24 
 sd/source/ui/view/ToolBarManager.cxx   |  292 
 sd/source/ui/view/ViewShellBase.cxx|  192 ++---
 sd/source/ui/view/ViewShellImplementation.cxx  |   46 -
 sd/source/ui/view/ViewShellManager.cxx |  120 +--
 sd/source/ui/view/ViewTabBar.cxx   |   18 
 sd/source/ui/view/WindowUpdater.cxx|   50 -
 sd/source/ui/view/drviews1.cxx |  430 ++--
 sd/source/ui/view/drviews3.cxx |   34 -
 sd/source/ui/view/drviews4.cxx |  746 +++---
 sd/source/ui/view/drviews5.cxx |   26 
 sd/source/ui/view/drviews7.cxx |   92 +-
 sd/source/ui/view/drviewsa.cxx |   30 
 sd/source/ui/view/drviewsb.cxx |   86 +-
 sd/source/ui/view/drviewsc.cxx |   37 -
 sd/source/ui/view/drviewse.cxx |  231 +++---
 sd/source/ui/view/drviewsf.cxx |   94 +-
 sd/source/ui/view/drviewsg.cxx |   58 -
 sd/source/ui/view/drviewsh.cxx |  170 ++---
 sd/source/ui/view/drviewsi.cxx |  116 +--
 sd/source/ui/view/frmview.cxx  |  628 +-
 sd/source/ui/view/outlnvsh.cxx |   80 +-
 sd/source/ui/view/outlview.cxx |  428 ++--
 sd/source/ui/view/sdview.cxx   |  170 ++---
 sd/source/ui/view/sdview2.cxx  |   40 -
 sd/source/ui/view/sdview3.cxx  |   44 -
 sd/source/ui/view/sdwindow.cxx |  244 +++
 sd/source/ui/view/viewoverlaymanager.cxx   |  142 ++--
 sd/source/ui/view/viewshe2.cxx |   53 -
 sd/source/ui/view/viewshe3.cxx |   48 -
 sd/source/ui/view/viewshel.cxx |  168 ++---
 49 files changed, 4109 insertions(+), 4096 deletions(-)

New commits:
commit fcdfb94ac11cd4832ad68c896c706fb3cb376ce4
Author: Noel Grandin 
AuthorDate: Thu Feb 14 09:10:57 2019 +0200
Commit: Noel Grandin 
CommitDate: Fri Feb 15 07:48:24 2019 +0100

loplugin:flatten in sd/source/ui/[t-u]*

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

diff --git a/sd/source/ui/table/TableDesignPane.cxx 
b/sd/source/ui/table/TableDesignPane.cxx
index 386986cea857..2f339b10aff7 100644
--- a/sd/source/ui/table/TableDesignPane.cxx
+++ b/sd/source/ui/table/TableDesignPane.cxx
@@ -211,30 +211,30 @@ void TableDesignWidget::ApplyOptions()
 ID_VAL_USEFIRSTCOLUMNSTYLE, ID_VAL_USELASTCOLUMNSTYLE, 
ID_VAL_USEBANDINGCOLUMNSTYLE
 };
 
-if( mxSelectedTable.is() )
+if( !mxSelectedTable.is() )
+return;
+
+SfxRequest aReq( SID_TABLE_STYLE_SETTINGS, SfxCallMode::SYNCHRON, 
SfxGetpApp()->GetPool() );
+
+for( sal_uInt16 i = CB_HEADER_ROW; i <= CB_BANDED_COLUMNS; ++i )
 {
-SfxRequest aReq( SID_TABLE_STYLE_SETTINGS, SfxCallMode::SYNCHRON, 
SfxGetpApp()->GetPool() );
+aReq.AppendItem( SfxBoolItem( gParamIds[i], 
m_aCheckBoxes[i]->IsChecked() ) );
+}
 
-for( sal_uInt16 i = CB_HEADER_ROW; i <= CB_BANDED_COLUMNS; ++i )
-{
-aReq.AppendItem( SfxBoolItem( gParamIds[i], 
m_aCheckBoxes[i]->IsChecked() ) );
-}
+SdrView* pView = mrBase.GetDrawView();
+if( !pView )
+return;
 
-SdrView* pView = mrBase.GetDrawView();
-if( pView )
-{
-const rtl::Reference< sdr::SelectionController >& xController( 
pView->getSelectionController() );
-if( xController.is() )
-{
-xController->Execute( aReq );
+const rtl::Reference< sdr::SelectionController >& xController( 
pView->getSelectionController() );
+if( xController.is() )
+{
+xCo

Windows Unit TestSwLayoutWriter::testBtlrCell Failing

[Luke Benes via LibreOffice]

Ever since:
https://cgit.freedesktop.org/libreoffice/core/commit/?id=a0bb480364c80192111ecab3501d63584e651ea3
or 
https://cgit.freedesktop.org/libreoffice/core/commit/?id=bef3818dbedba467a257e2573e298d98062be37b

The build is failing with:

C:/core/test/source/xmltesttools.cxx:139:SwLayoutWriter::testBtlrCell
equality assertion failed
- Expected: 2707
- Actual  : 2710
- In <>, attribute 'y' of '//textarray[1]' incorrect value.

SwLayoutWriter::testBtlrCell finished in: 132ms
C:/core/test/source/xmltesttools.cxx(139) : error : Assertion
Test name: SwLayoutWriter::testBtlrCell
equality assertion failed
- Expected: 2707
- Actual  : 2710
- In <>, attribute 'y' of '//textarray[1]' incorrect value.

Failures !!!
Run: 39   Failure total: 1   Failures: 1   Errors: 0

Error: a unit test failed, please do one of:
make CppunitTest_sw_layoutwriter CPPUNITTRACE=TRUE # which is a shortcut for 
the following line
make CppunitTest_sw_layoutwriter CPPUNITTRACE="'C:/Program Files 
(x86)/Microsoft Visual Studio/2017/Community/Common7/IDE/devenv.exe' /debugexe" 
# for interactive debugging in Visual Studio
make CppunitTest_sw_layoutwriter CPPUNITTRACE="drmemory -free_max_frames 20" # 
for memory checking (install Dr.Memory first, and put it to your PATH)

You can limit the execution to just one particular test by:

make CppunitTest_sw_layoutwriter CPPUNIT_TEST_NAME="testXYZ" ...above mentioned 
params...

make[1]: *** [C:/core/solenv/gbuild/CppunitTest.mk:114: 
C:/core/workdir/CppunitTest/sw_layoutwriter.test] Error 1
make: *** [Makefile:167: CppunitTest_sw_layoutwriter] Error 2


64-bit build 
CPU threads: 4; OS: Windows 10.0; UI render: default; 
GPU Intel HD 4000

Would you like any more debug info?
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Libreoffice Gerrit user]

 sc/uiconfig/scalc/ui/showdetaildialog.ui |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 14821eae0fa0f6a3de22a6b1b8641e314e2a9052
Author: Caolán McNamara 
AuthorDate: Thu Feb 14 16:18:01 2019 +
Commit: Adolfo Jayme Barrientos 
CommitDate: Fri Feb 15 03:29:23 2019 +0100

buttons are at the wrong end

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

diff --git a/sc/uiconfig/scalc/ui/showdetaildialog.ui 
b/sc/uiconfig/scalc/ui/showdetaildialog.ui
index 13fdb58fe1b0..544c15f93c7a 100644
--- a/sc/uiconfig/scalc/ui/showdetaildialog.ui
+++ b/sc/uiconfig/scalc/ui/showdetaildialog.ui
@@ -1,5 +1,5 @@
 
-
+
 
   
   
@@ -21,6 +21,9 @@
 0
 0
 dialog
+
+  
+
 
   
 False
@@ -31,7 +34,7 @@
 
   
 False
-start
+end
 
   
 gtk-ok
@@ -111,7 +114,7 @@
   
 
 
-   
+  
 True
 True
 True
@@ -164,8 +167,5 @@
   cancel
   help
 
-
-  
-
   
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx   |   
49 -
 sd/source/ui/framework/configuration/Configuration.cxx |   
32 
 sd/source/ui/framework/configuration/ConfigurationController.cxx   |  
102 +-
 sd/source/ui/framework/configuration/ConfigurationUpdater.cxx  |   
24 
 sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.cxx |   
20 
 sd/source/ui/framework/factories/BasicPaneFactory.cxx  |  
126 +--
 sd/source/ui/framework/factories/BasicToolBarFactory.cxx   |   
60 -
 sd/source/ui/framework/factories/BasicViewFactory.cxx  |  
136 +--
 sd/source/ui/framework/factories/ChildWindowPane.cxx   |   
42 -
 sd/source/ui/framework/factories/FullScreenPane.cxx|   
26 
 sd/source/ui/framework/factories/PresentationFactory.cxx   |   
32 
 sd/source/ui/framework/module/CenterViewFocusModule.cxx|   
44 -
 sd/source/ui/framework/module/ModuleController.cxx |   
64 -
 sd/source/ui/framework/module/ShellStackGuard.cxx  |   
22 
 sd/source/ui/framework/module/SlideSorterModule.cxx|  
112 +--
 sd/source/ui/framework/module/ToolBarModule.cxx|  
104 +-
 sd/source/ui/framework/module/ViewTabBarModule.cxx |  
170 ++--
 sd/source/ui/framework/tools/FrameworkHelper.cxx   |   
52 -
 sd/source/ui/func/fubullet.cxx |  
242 +++---
 sd/source/ui/func/fuconarc.cxx |   
52 -
 sd/source/ui/func/fuconbez.cxx |   
46 -
 sd/source/ui/func/fuconrec.cxx |  
298 
 sd/source/ui/func/fucopy.cxx   |  
346 -
 sd/source/ui/func/fuexpand.cxx |  
274 +++
 sd/source/ui/func/fuformatpaintbrush.cxx   |   
40 -
 sd/source/ui/func/fuhhconv.cxx |  
104 +-
 sd/source/ui/func/fuinsert.cxx |  
124 +--
 sd/source/ui/func/fuinsfil.cxx |  
194 ++---
 sd/source/ui/func/fulinend.cxx |  
140 ++--
 sd/source/ui/func/fumorph.cxx  |  
324 -
 sd/source/ui/func/fuoaprms.cxx |  
350 +-
 sd/source/ui/func/fupage.cxx   |   
24 
 sd/source/ui/func/fupoor.cxx   |  
113 +--
 sd/source/ui/func/fuprlout.cxx |  
146 ++--
 sd/source/ui/func/fuprobjs.cxx |   
70 +-
 sd/source/ui/func/fusearch.cxx |   
48 -
 sd/source/ui/func/fusldlg.cxx  |  
184 ++---
 sd/source/ui/func/futext.cxx   |  
180 ++---
 sd/source/ui/func/fuvect.cxx   |   
51 -
 sd/source/ui/func/smarttag.cxx |   
24 
 40 files changed, 2296 insertions(+), 2295 deletions(-)

New commits:
commit 86e5ec2e5f199185dd8e9a03e72d4a2f81d9eabc
Author: Noel Grandin 
AuthorDate: Thu Feb 14 09:12:06 2019 +0200
Commit: Noel Grandin 
CommitDate: Fri Feb 15 09:48:47 2019 +0100

loplugin:flatten in sd/source/ui/framework

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

diff --git 
a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx 
b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx
index debdc348acf1..6f02779ead31 100644
--- a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx
+++ b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx
@@ -131,36 +131,35 @@ void ChangeRequestQueueProcessor::ProcessOneEvent()
 
 SAL_INFO("sd.fwk", OSL_THIS_FUNC << ": ProcessOneEvent");
 
-if (mxConfiguration.is()
-&& ! maQueue.empty())
-{
-// Get and remove the first entry from the queue.
-Reference xRequest (maQueue.front());
-maQueue.pop_front();
+if (!mxConfiguration.is() || maQueue.empty())
+return;
 
-// Execute the change request.
-if (xRequest.is())
-{
+// Get and remove the first entry from the queue.
+Reference xRequest (maQueue.front());
+maQueue.pop_front();
+
+// Execute the change request.
+if (xRe

[Libreoffice-commits] core.git: solenv/bin xmloff/inc xmloff/source xmloff/util

[Libreoffice Gerrit user]

 solenv/bin/native-code.py   |1 +
 xmloff/inc/facreg.hxx   |5 -
 xmloff/source/core/facreg.cxx   |1 -
 xmloff/source/draw/sdxmlexp.cxx |   11 ++-
 xmloff/util/xo.component|3 ++-
 5 files changed, 13 insertions(+), 8 deletions(-)

New commits:
commit 21ed57d810f64a9d87801c1cf060d1b94690af99
Author: Miklos Vajna 
AuthorDate: Thu Feb 14 21:32:15 2019 +0100
Commit: Miklos Vajna 
CommitDate: Fri Feb 15 08:49:11 2019 +0100

xmloff: create XMLImpressStylesExportOasis instances with an uno constructor

Change-Id: I831321bcce241bc180e22b20364137f776fee0f9
Reviewed-on: https://gerrit.libreoffice.org/67847
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 

diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 557c67d56aa7..a84945d15c1e 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -254,6 +254,7 @@ core_constructor_list = [
 "XMLVersionListPersistence_get_implementation",
 "com_sun_star_comp_Impress_XMLOasisImporter_get_implementation",
 "com_sun_star_comp_Impress_XMLOasisExporter_get_implementation",
+"com_sun_star_comp_Impress_XMLOasisStylesExporter_get_implementation",
 # xmlscript/util/xmlscript.component
 "com_sun_star_comp_xmlscript_XMLBasicExporter",
 "com_sun_star_comp_xmlscript_XMLBasicImporter",
diff --git a/xmloff/inc/facreg.hxx b/xmloff/inc/facreg.hxx
index c48af506ca8a..07655681c146 100644
--- a/xmloff/inc/facreg.hxx
+++ b/xmloff/inc/facreg.hxx
@@ -56,11 +56,6 @@ css::uno::Reference 
XMLImpressSettingsImportOasis_createIn
 css::uno::Reference const & rSMgr);
 
 // impress oasis export
-OUString XMLImpressStylesExportOasis_getImplementationName() throw();
-css::uno::Sequence 
XMLImpressStylesExportOasis_getSupportedServiceNames() throw();
-/// @throws css::uno::Exception
-css::uno::Reference 
XMLImpressStylesExportOasis_createInstance(
-css::uno::Reference const & rSMgr);
 OUString XMLImpressContentExportOasis_getImplementationName() throw();
 css::uno::Sequence 
XMLImpressContentExportOasis_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception
diff --git a/xmloff/source/core/facreg.cxx b/xmloff/source/core/facreg.cxx
index 329967efd696..6488cd7f456e 100644
--- a/xmloff/source/core/facreg.cxx
+++ b/xmloff/source/core/facreg.cxx
@@ -63,7 +63,6 @@ XMLOFF_DLLPUBLIC void * xo_component_getFactory( const 
sal_Char * pImplName, voi
 else SINGLEFACTORY( XMLImpressSettingsImportOasis )
 
 // impress oasis export
-else SINGLEFACTORY( XMLImpressStylesExportOasis )
 else SINGLEFACTORY( XMLImpressContentExportOasis )
 else SINGLEFACTORY( XMLImpressMetaExportOasis )
 else SINGLEFACTORY( XMLImpressSettingsExportOasis )
diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx
index 41dc67caea15..f6f6640ae166 100644
--- a/xmloff/source/draw/sdxmlexp.cxx
+++ b/xmloff/source/draw/sdxmlexp.cxx
@@ -2662,7 +2662,16 @@ 
com_sun_star_comp_Impress_XMLOasisExporter_get_implementation(
 | SvXMLExportFlags::FONTDECLS | SvXMLExportFlags::EMBEDDED));
 }
 
-SERVICE( XMLImpressStylesExportOasis, 
"com.sun.star.comp.Impress.XMLOasisStylesExporter", 
"XMLImpressStylesExportOasis", false, 
SvXMLExportFlags::OASIS|SvXMLExportFlags::STYLES|SvXMLExportFlags::MASTERSTYLES|SvXMLExportFlags::AUTOSTYLES|SvXMLExportFlags::FONTDECLS
 );
+extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface*
+com_sun_star_comp_Impress_XMLOasisStylesExporter_get_implementation(
+uno::XComponentContext* pCtx, uno::Sequence const& /*rSeq*/)
+{
+return cppu::acquire(new SdXMLExport(
+pCtx, "XMLImpressStylesExportOasis", false,
+SvXMLExportFlags::OASIS | SvXMLExportFlags::STYLES | 
SvXMLExportFlags::MASTERSTYLES
+| SvXMLExportFlags::AUTOSTYLES | SvXMLExportFlags::FONTDECLS));
+}
+
 SERVICE( XMLImpressContentExportOasis, 
"com.sun.star.comp.Impress.XMLOasisContentExporter", 
"XMLImpressContentExportOasis", false, 
SvXMLExportFlags::OASIS|SvXMLExportFlags::AUTOSTYLES|SvXMLExportFlags::CONTENT|SvXMLExportFlags::SCRIPTS|SvXMLExportFlags::FONTDECLS
 );
 SERVICE( XMLImpressMetaExportOasis, 
"com.sun.star.comp.Impress.XMLOasisMetaExporter", "XMLImpressMetaExportOasis", 
false, SvXMLExportFlags::OASIS|SvXMLExportFlags::META );
 SERVICE( XMLImpressSettingsExportOasis, 
"com.sun.star.comp.Impress.XMLOasisSettingsExporter", 
"XMLImpressSettingsExportOasis", false, 
SvXMLExportFlags::OASIS|SvXMLExportFlags::SETTINGS );
diff --git a/xmloff/util/xo.component b/xmloff/util/xo.component
index fe88914cdc88..db037edd20a7 100644
--- a/xmloff/util/xo.component
+++ b/xmloff/util/xo.component
@@ -135,7 +135,8 @@
   
 
   
-  
+  
 
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits