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

2018-01-20 Thread Maxim Monastirsky 
 vcl/source/control/button.cxx |8 
 vcl/source/window/builder.cxx |   28 
 2 files changed, 8 insertions(+), 28 deletions(-)

New commits:
commit 18ada80e3f98318d94b3be8109cd86eda1d095c8
Author: Maxim Monastirsky 
Date:   Fri Jan 19 03:19:37 2018 +0200

WB_NOPOINTERFOCUS can be added after the button is created

Change-Id: I3f06aa8ea4edb981d201210b783c4624ffd68d16
Reviewed-on: https://gerrit.libreoffice.org/48175
Tested-by: Jenkins 
Reviewed-by: Maxim Monastirsky 

diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index ea0e7fd8e846..949cc65d5a9b 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -594,6 +594,14 @@ bool Button::set_property(const OString &rKey, const 
OUString &rValue)
 eAlign = ImageAlign::Bottom;
 SetImageAlign(eAlign);
 }
+else if (rKey == "focus-on-click")
+{
+WinBits nBits = GetStyle();
+nBits &= ~WB_NOPOINTERFOCUS;
+if (!toBool(rValue))
+nBits |= WB_NOPOINTERFOCUS;
+SetStyle(nBits);
+}
 else
 return Control::set_property(rKey, rValue);
 return true;
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index bde5585c26da..0a10d7a4ded6 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -669,18 +669,6 @@ namespace
 return bIsStock;
 }
 
-bool extractFocusOnClick(VclBuilder::stringmap &rMap)
-{
-bool bFocusOnClick = true;
-VclBuilder::stringmap::iterator aFind = 
rMap.find(OString("focus-on-click"));
-if (aFind != rMap.end())
-{
-bFocusOnClick = toBool(aFind->second);
-rMap.erase(aFind);
-}
-return bFocusOnClick;
-}
-
 WinBits extractRelief(VclBuilder::stringmap &rMap)
 {
 WinBits nBits = WB_3DLOOK;
@@ -792,8 +780,6 @@ namespace
 WinBits nBits = WB_CLIPCHILDREN|WB_CENTER|WB_VCENTER;
 
 nBits |= extractRelief(rMap);
-if (!extractFocusOnClick(rMap))
-nBits |= WB_NOPOINTERFOCUS;
 
 VclPtr xWindow;
 
@@ -825,8 +811,6 @@ namespace
 WinBits nBits = WB_CLIPCHILDREN|WB_CENTER|WB_VCENTER|WB_3DLOOK;
 
 nBits |= extractRelief(rMap);
-if (!extractFocusOnClick(rMap))
-nBits |= WB_NOPOINTERFOCUS;
 
 VclPtr xWindow = VclPtr::Create(pParent, nBits);
 
@@ -843,8 +827,6 @@ namespace
 WinBits nBits = WB_CLIPCHILDREN|WB_CENTER|WB_VCENTER|WB_3DLOOK;
 
 nBits |= extractRelief(rMap);
-if (!extractFocusOnClick(rMap))
-nBits |= WB_NOPOINTERFOCUS;
 
 VclPtr xWindow = VclPtr::Create(pParent, 
nBits);
 
@@ -1276,8 +1258,6 @@ VclPtr VclBuilder::makeObject(vcl::Window 
*pParent, const OString &
 OUString sWrap = BuilderUtils::extractCustomProperty(rMap);
 if (!sWrap.isEmpty())
 nBits |= WB_WORDBREAK;
-if (!extractFocusOnClick(rMap))
-nBits |= WB_NOPOINTERFOCUS;
 VclPtr xButton = VclPtr::Create(pParent, 
nBits);
 xButton->SetImageAlign(ImageAlign::Left); //default to left
 xWindow = xButton;
@@ -1293,8 +1273,6 @@ VclPtr VclBuilder::makeObject(vcl::Window 
*pParent, const OString &
 OUString sWrap = BuilderUtils::extractCustomProperty(rMap);
 if (!sWrap.isEmpty())
 nBits |= WB_WORDBREAK;
-if (!extractFocusOnClick(rMap))
-nBits |= WB_NOPOINTERFOCUS;
 //maybe always import as TriStateBox and enable/disable tristate
 bool bIsTriState = extractInconsistent(rMap);
 VclPtr xCheckBox;
@@ -1676,18 +1654,12 @@ VclPtr VclBuilder::makeObject(vcl::Window 
*pParent, const OString &
 VclPtr xParent(pParent);
 pFunction(xWindow, xParent, rMap);
 if (xWindow->GetType() == WindowType::PUSHBUTTON)
-{
-if (!extractFocusOnClick(rMap))
-xWindow->SetStyle(xWindow->GetStyle() | 
WB_NOPOINTERFOCUS);
 setupFromActionName(static_cast(xWindow.get()), 
rMap, m_xFrame);
-}
 else if (xWindow->GetType() == WindowType::MENUBUTTON)
 {
 OUString sMenu = BuilderUtils::extractCustomProperty(rMap);
 if (!sMenu.isEmpty())
 m_pParserState->m_aButtonMenuMaps.emplace_back(id, 
sMenu);
-if (!extractFocusOnClick(rMap))
-xWindow->SetStyle(xWindow->GetStyle() | 
WB_NOPOINTERFOCUS);
 setupFromActionName(static_cast(xWindow.get()), 
rMap, m_xFrame);
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: ios/LibreOfficeLight

2018-01-20 Thread Jon Nermut 
 ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj  |   28 
 ios/LibreOfficeLight/LibreOfficeLight/DocumentController.swift   |4 
 ios/LibreOfficeLight/LibreOfficeLight/DocumentTiledView.swift|   65 +
 ios/LibreOfficeLight/LibreOfficeLight/LOKit/DocumentHolder.swift |  327 
+
 ios/LibreOfficeLight/LibreOfficeLight/LOKit/LOKitThread.swift|  350 
--
 ios/LibreOfficeLight/LibreOfficeLight/LOKit/RenderCache.swift|   78 ++
 6 files changed, 489 insertions(+), 363 deletions(-)

New commits:
commit a468fef9ac977e812e83e3cce462b75d8d24c64d
Author: Jon Nermut 
Date:   Sat Jan 20 17:08:43 2018 +1100

iOS: keep track of doc part

- implement swipe left/right and tap gestures for presentations
- move some classes to their own files

Change-Id: I3ddd3e17ec809c87097d5515f08038bbc969764f
Reviewed-on: https://gerrit.libreoffice.org/48231
Reviewed-by: jan iversen 
Tested-by: jan iversen 

diff --git a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj 
b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
index 48174b80e271..315d4d18151b 100644
--- a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
+++ b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
@@ -33,6 +33,8 @@
39B091CE1E5F0BB800682A59 /* unorc in Resources */ = {isa = 
PBXBuildFile; fileRef = 39B08B9C1E5F0BB600682A59 /* unorc */; };
39E950531FC9842000D82C49 /* source in Resources */ = {isa = 
PBXBuildFile; fileRef = 39E950521FC9842000D82C49 /* source */; };
39EF4E2F1FA500C9001914AC /* PropertiesController.swift in 
Sources */ = {isa = PBXBuildFile; fileRef = 39EF4E2E1FA500C9001914AC /* 
PropertiesController.swift */; };
+   FC31D01E2012F65500E7F402 /* DocumentHolder.swift in Sources */ 
= {isa = PBXBuildFile; fileRef = FC31D01D2012F65500E7F402 /* 
DocumentHolder.swift */; };
+   FC31D0202012F6D300E7F402 /* RenderCache.swift in Sources */ = 
{isa = PBXBuildFile; fileRef = FC31D01F2012F6D300E7F402 /* RenderCache.swift 
*/; };
FCAB1CB82009DB6900F1CC34 /* DocumentOverlaysView.swift in 
Sources */ = {isa = PBXBuildFile; fileRef = FCAB1CB72009DB6900F1CC34 /* 
DocumentOverlaysView.swift */; };
FCC2E3FA2004A01500CEB504 /* Document.swift in Sources */ = {isa 
= PBXBuildFile; fileRef = FCC2E3F62004A01400CEB504 /* Document.swift */; };
FCC2E3FC2004A01500CEB504 /* LibreOfficeKitWrapper.swift in 
Sources */ = {isa = PBXBuildFile; fileRef = FCC2E3F82004A01400CEB504 /* 
LibreOfficeKitWrapper.swift */; };
@@ -77,6 +79,14 @@
39E950521FC9842000D82C49 /* source */ = {isa = 
PBXFileReference; lastKnownFileType = folder; name = source; path = ../source; 
sourceTree = ""; };
39EE81531FA644E800B73AB8 /* Info.plist */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = 
Info.plist; sourceTree = ""; };
39EF4E2E1FA500C9001914AC /* PropertiesController.swift */ = 
{isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = 
sourcecode.swift; path = PropertiesController.swift; sourceTree = ""; };
+   FC31D00E2012EE4A00E7F402 /* LibreOfficeKit.h */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = 
LibreOfficeKit.h; sourceTree = ""; };
+   FC31D00F2012EE4A00E7F402 /* LibreOfficeKit.hxx */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path 
= LibreOfficeKit.hxx; sourceTree = ""; };
+   FC31D0102012EE4A00E7F402 /* LibreOfficeKitEnums.h */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = 
LibreOfficeKitEnums.h; sourceTree = ""; };
+   FC31D0112012EE4A00E7F402 /* LibreOfficeKitGtk.h */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = 
LibreOfficeKitGtk.h; sourceTree = ""; };
+   FC31D0122012EE4A00E7F402 /* LibreOfficeKitInit.h */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = 
LibreOfficeKitInit.h; sourceTree = ""; };
+   FC31D0132012EE4A00E7F402 /* LibreOfficeKitTypes.h */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = 
LibreOfficeKitTypes.h; sourceTree = ""; };
+   FC31D01D2012F65500E7F402 /* DocumentHolder.swift */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.swift; path = 
DocumentHolder.swift; sourceTree = ""; };
+   FC31D01F2012F6D300E7F402 /* RenderCache.swift */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.swift; path = 
RenderCache.swift; sourceTree = ""; };
FCAB1CB72009DB6900F1CC34 /* DocumentOverlaysView.swift */ = 
{isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = 
DocumentOverlaysView.swift; sourceTree = ""; };
FCC2E3F62004A01400CEB504

[Libreoffice-commits] core.git: ios/LibreOfficeLight

2018-01-20 Thread Jon Nermut 
 ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit a41ec55c8c86f962392cd64edc382a6eae113cfd
Author: Jon Nermut 
Date:   Sat Jan 20 10:10:26 2018 +1100

iOS: Fix debugging in xcode by making include path non-recursive

it was picking up the wrong headers in the debugger

Change-Id: I0bf6a10504e3b3e9a6eb13355f3f8a4f63a15a1e
Reviewed-on: https://gerrit.libreoffice.org/48230
Reviewed-by: jan iversen 
Tested-by: jan iversen 

diff --git a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj 
b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
index 9dfb847307cc..48174b80e271 100644
--- a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
+++ b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
@@ -489,7 +489,7 @@
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
HEADER_SEARCH_PATHS = (
"$(inherited)",
-   "$(PROJECT_DIR)/../../include/**",
+   "$(PROJECT_DIR)/../../include",
);
INFOPLIST_FILE = LibreOfficeLight/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 11.2;
@@ -522,7 +522,7 @@
GCC_PREFIX_HEADER = 
"LibreOfficeLight/LibreOfficeLight-Prefix.pch";
HEADER_SEARCH_PATHS = (
"$(inherited)",
-   "$(PROJECT_DIR)/../../include/**",
+   "$(PROJECT_DIR)/../../include",
);
INFOPLIST_FILE = LibreOfficeLight/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 11.2;
@@ -624,7 +624,7 @@
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
HEADER_SEARCH_PATHS = (
"$(inherited)",
-   "$(PROJECT_DIR)/../../include/**",
+   "$(PROJECT_DIR)/../../include",
);
INFOPLIST_FILE = LibreOfficeLight/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 11.2;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - desktop/source ios/CustomTarget_iOS_setup.mk

2018-01-20 Thread jan Iversen 
 desktop/source/app/appinit.cxx |7 +++
 ios/CustomTarget_iOS_setup.mk  |1 -
 2 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit cc2b9a257b6436ab6f84d6e158a64c09b0937eb6
Author: jan Iversen 
Date:   Sat Jan 20 18:52:39 2018 +0100

iOS, remove double [bootstrap]

two bootstrap sections in one rc file seems wrong.

Change-Id: Ic7f8eac2d3d07b35736d11ad1fbe705135cb1785

diff --git a/ios/CustomTarget_iOS_setup.mk b/ios/CustomTarget_iOS_setup.mk
index 543ef306a7db..6242354eeebe 100644
--- a/ios/CustomTarget_iOS_setup.mk
+++ b/ios/CustomTarget_iOS_setup.mk
@@ -58,7 +58,6 @@ $(IOSGEN)/native-code.h: $(BUILDDIR)/config_host.mk \
(echo '[Bootstrap]' \
&& echo 'URE_BOOTSTRAP=file://$$APP_DATA_DIR/fundamentalrc' \
&& echo 'HOME=$$SYSUSERHOME'  \
-   && echo '[Bootstrap]' \
) > $(IOSRES)/rc
 
# Set up fundamentalrc, unorc, bootstraprc and versionrc.
commit feb601b75142f3234bb51f9566a70c4db488a061
Author: jan Iversen 
Date:   Sat Jan 20 18:51:13 2018 +0100

iOS, allow unorc to be read

One reason why init did not work, was that it did a throw due
to a wrong path on unorc

Change-Id: I928f25358befe05f8986e9ebcffda27e8beb397c

diff --git a/desktop/source/app/appinit.cxx b/desktop/source/app/appinit.cxx
index 853eaf8734ae..826c525eb6c1 100644
--- a/desktop/source/app/appinit.cxx
+++ b/desktop/source/app/appinit.cxx
@@ -80,6 +80,13 @@ void Desktop::InitApplicationServiceManager()
 sm.set(
 cppu::defaultBootstrap_InitialComponentContext( aUnoRc 
)->getServiceManager(),
 UNO_QUERY_THROW);
+#elif defined(IOS)
+OUString uri( "$APP_DATA_DIR" );
+rtl_bootstrap_expandMacros( &uri.pData );
+OUString aUnoRc("file://" + uri  + "/unorc");
+sm.set(
+   cppu::defaultBootstrap_InitialComponentContext( aUnoRc 
)->getServiceManager(),
+   UNO_QUERY_THROW);
 #else
 sm.set(
 cppu::defaultBootstrap_InitialComponentContext()->getServiceManager(),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Implementing accessibility non-regression check tool

2018-01-20 Thread toki 
On 01/18/2018 11:36 AM, Samuel Thibault wrote:

> Basically, the idea is to design a tool which will check .ui files for
> accessibility issues: missing relations between widgets and labels,
> notably. The tool would just use libxml to parse the files and emit
> warnings for the found issues.

Will this proposed tool mean that LibreOffice will be usable with JAWS,
despite all of the hard work on the part of the successors of Freedom
Scientific, to ensure otherwise?

jonathon



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

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

2018-01-20 Thread Rene Engelhard 
 sysui/desktop/apparmor/program.soffice.bin |8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 24702687433842a6e9e8a1070ead46c035192bf3
Author: Rene Engelhard 
Date:   Sat Jan 20 15:54:43 2018 +0100

deb#887593 use child profile for gpg

see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=887593#41

Change-Id: I365de8bf8a43a1aa304c5206a1f0c29d6a44855e

diff --git a/sysui/desktop/apparmor/program.soffice.bin 
b/sysui/desktop/apparmor/program.soffice.bin
index cbed1b69d4a2..ba1e248917be 100644
--- a/sysui/desktop/apparmor/program.soffice.bin
+++ b/sysui/desktop/apparmor/program.soffice.bin
@@ -126,8 +126,8 @@ profile libreoffice-soffice INSTDIR-program/soffice.bin 
flags=(complain) {
   /usr/bin/lpr  rmPUx,
   /usr/bin/paperconfrmix,
   /usr/bin/gpgconf  rmix,
-  /usr/bin/gpg  rmix,
-  /usr/bin/gpgsmrmix,
+  /usr/bin/gpg  rmCx -> gpg,
+  /usr/bin/gpgsmrmCx -> gpg,
 
   /dev/tty  rw,
 
@@ -171,5 +171,7 @@ profile libreoffice-soffice INSTDIR-program/soffice.bin 
flags=(complain) {
 
   owner @{HOME}/.mozilla/firefox/** r,
   # there is abstractions/gnupg but that's just for gpg1...
-  owner @{HOME}/.gnupg/* r,
+  profile gpg {
+owner @{HOME}/.gnupg/* r,
+  }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] libmspub.git: src/lib

2018-01-20 Thread David Tardon 
 src/lib/MSPUBParser.cpp |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 875a2afea73aaea306fb757dc2533c26686206f6
Author: David Tardon 
Date:   Sat Jan 20 15:30:01 2018 +0100

ofz#5515 avoid signed integer overflow

Change-Id: I80207d028bd5348e4f53bf7deec1eb48e6c2

diff --git a/src/lib/MSPUBParser.cpp b/src/lib/MSPUBParser.cpp
index 05e0e11..d838d5d 100644
--- a/src/lib/MSPUBParser.cpp
+++ b/src/lib/MSPUBParser.cpp
@@ -1957,8 +1957,8 @@ void 
MSPUBParser::parseEscherShape(librevenge::RVNGInputStream *input, const Esc
 int coordSystemHeight = thisParentCoordinateSystem.m_ye - 
thisParentCoordinateSystem.m_ys;
 if (coordSystemHeight == 0)
   coordSystemHeight = 1;
-int groupWidth = parentGroupAbsoluteCoord.m_xe - 
parentGroupAbsoluteCoord.m_xs;
-int groupHeight = parentGroupAbsoluteCoord.m_ye - 
parentGroupAbsoluteCoord.m_ys;
+int groupWidth = int64_t(parentGroupAbsoluteCoord.m_xe) - 
parentGroupAbsoluteCoord.m_xs;
+int groupHeight = int64_t(parentGroupAbsoluteCoord.m_ye) - 
parentGroupAbsoluteCoord.m_ys;
 double widthScale = (double)groupWidth / coordSystemWidth;
 double heightScale = (double)groupHeight / coordSystemHeight;
 int xs = (readU32(input) - thisParentCoordinateSystem.m_xs) * 
widthScale + parentGroupAbsoluteCoord.m_xs;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - sw/qa sw/source

2018-01-20 Thread Julien Nabet 
 sw/qa/extras/odfimport/data/tdf115079.odt |binary
 sw/qa/extras/odfimport/odfimport.cxx  |5 +
 sw/source/core/layout/tabfrm.cxx  |9 -
 3 files changed, 13 insertions(+), 1 deletion(-)

New commits:
commit 66ad52d05a11b87f921e782ffb6a9b49528fc194
Author: Julien Nabet 
Date:   Thu Jan 18 08:37:04 2018 +0100

tdf#115079: check that row frame belongs to table frame to avoid segfault

A row frame may not belong to a table frame, when it is being cut, e.g., in
lcl_PostprocessRowsInCells().
Its SwRowFrame::Cut() has been called; it in turn called 
SwLayoutFrame::Cut(),
which nullified row's upper in RemoveFromLayout(), and then called Shrink()
for its former upper.
Regardless of whether it will be pasted back, or destroyed, currently it's 
not
part of layout, and its height does not count.

See bt https://bugs.documentfoundation.org/attachment.cgi?id=139171

Change-Id: I4010e1f246a3ebb89b3f972a03619a2775146da4
(cherry picked from commit daf1b10f4e266818b6e14f0f1dfddd66f0a3a2f0)
Reviewed-on: https://gerrit.libreoffice.org/48234
Tested-by: Jenkins 
Reviewed-by: Mike Kaganski 

diff --git a/sw/qa/extras/odfimport/data/tdf115079.odt 
b/sw/qa/extras/odfimport/data/tdf115079.odt
new file mode 100644
index ..6c1039e71ced
Binary files /dev/null and b/sw/qa/extras/odfimport/data/tdf115079.odt differ
diff --git a/sw/qa/extras/odfimport/odfimport.cxx 
b/sw/qa/extras/odfimport/odfimport.cxx
index f502531f8485..6eda80f3febf 100644
--- a/sw/qa/extras/odfimport/odfimport.cxx
+++ b/sw/qa/extras/odfimport/odfimport.cxx
@@ -862,5 +862,10 @@ DECLARE_ODFIMPORT_TEST(testTdf94882, "tdf94882.odt")
 CPPUNIT_ASSERT_EQUAL(OUString("This is the first page header"), 
headertext);
 }
 
+DECLARE_ODFIMPORT_TEST(testTdf115079, "tdf115079.odt")
+{
+// This document caused segfault when layouting
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index 1de4d238e270..fdeb528a86f0 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -4016,7 +4016,14 @@ static SwTwips lcl_calcHeightOfRowBeforeThisFrame(const 
SwRowFrame& rRow)
 {
 // We've found another row frame that is part of the same table row
 const SwTabFrame* pCurTab = pCurRow->FindTabFrame();
-if (pCurTab->IsAnFollow(pTab))
+// A row frame may not belong to a table frame, when it is being 
cut, e.g., in
+// lcl_PostprocessRowsInCells().
+// Its SwRowFrame::Cut() has been called; it in turn called 
SwLayoutFrame::Cut(),
+// which nullified row's upper in RemoveFromLayout(), and then 
called Shrink()
+// for its former upper.
+// Regardless of whether it will be pasted back, or destroyed, 
currently it's not
+// part of layout, and its height does not count
+if (pCurTab && pCurTab->IsAnFollow(pTab))
 {
 // The found row frame belongs to a table frame that precedes
 // (above) this one in chain. So, include it in the sum
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2018-01-20 Thread Julien Nabet 
 sw/qa/extras/odfimport/data/tdf115079.odt |binary
 sw/qa/extras/odfimport/odfimport.cxx  |5 +
 sw/source/core/layout/tabfrm.cxx  |9 -
 3 files changed, 13 insertions(+), 1 deletion(-)

New commits:
commit 4bfa6ad5ca95bdcee12f8cd0544b5f08558050c5
Author: Julien Nabet 
Date:   Thu Jan 18 08:37:04 2018 +0100

tdf#115079: check that row frame belongs to table frame to avoid segfault

A row frame may not belong to a table frame, when it is being cut, e.g., in
lcl_PostprocessRowsInCells().
Its SwRowFrame::Cut() has been called; it in turn called 
SwLayoutFrame::Cut(),
which nullified row's upper in RemoveFromLayout(), and then called Shrink()
for its former upper.
Regardless of whether it will be pasted back, or destroyed, currently it's 
not
part of layout, and its height does not count.

See bt https://bugs.documentfoundation.org/attachment.cgi?id=139171

Change-Id: I4010e1f246a3ebb89b3f972a03619a2775146da4
(cherry picked from commit daf1b10f4e266818b6e14f0f1dfddd66f0a3a2f0)
Reviewed-on: https://gerrit.libreoffice.org/48233
Tested-by: Jenkins 
Reviewed-by: Mike Kaganski 

diff --git a/sw/qa/extras/odfimport/data/tdf115079.odt 
b/sw/qa/extras/odfimport/data/tdf115079.odt
new file mode 100644
index ..6c1039e71ced
Binary files /dev/null and b/sw/qa/extras/odfimport/data/tdf115079.odt differ
diff --git a/sw/qa/extras/odfimport/odfimport.cxx 
b/sw/qa/extras/odfimport/odfimport.cxx
index 032a4a5da574..a638dd818574 100644
--- a/sw/qa/extras/odfimport/odfimport.cxx
+++ b/sw/qa/extras/odfimport/odfimport.cxx
@@ -882,5 +882,10 @@ DECLARE_ODFIMPORT_TEST(testBlankBeforeFirstPage, 
"tdf94882.odt")
 );
 }
 
+DECLARE_ODFIMPORT_TEST(testTdf115079, "tdf115079.odt")
+{
+// This document caused segfault when layouting
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index 491c3f3b2e52..859c78b9c50d 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -4093,7 +4093,14 @@ static SwTwips lcl_calcHeightOfRowBeforeThisFrame(const 
SwRowFrame& rRow)
 {
 // We've found another row frame that is part of the same table row
 const SwTabFrame* pCurTab = pCurRow->FindTabFrame();
-if (pCurTab->IsAnFollow(pTab))
+// A row frame may not belong to a table frame, when it is being 
cut, e.g., in
+// lcl_PostprocessRowsInCells().
+// Its SwRowFrame::Cut() has been called; it in turn called 
SwLayoutFrame::Cut(),
+// which nullified row's upper in RemoveFromLayout(), and then 
called Shrink()
+// for its former upper.
+// Regardless of whether it will be pasted back, or destroyed, 
currently it's not
+// part of layout, and its height does not count
+if (pCurTab && pCurTab->IsAnFollow(pTab))
 {
 // The found row frame belongs to a table frame that precedes
 // (above) this one in chain. So, include it in the sum
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2018-01-20 Thread Julien Nabet 
 include/svx/svdglue.hxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 619a06d2712e340e82dfd701a0c6363058929c27
Author: Julien Nabet 
Date:   Sat Jan 20 09:01:45 2018 +0100

tdf#115100: fix assertions in svdglue.hxx

See bt:
https://bugs.documentfoundation.org/attachment.cgi?id=139225

See comments
https://bugs.documentfoundation.org/show_bug.cgi?id=115100#c2
https://bugs.documentfoundation.org/show_bug.cgi?id=115100#c3

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

diff --git a/include/svx/svdglue.hxx b/include/svx/svdglue.hxx
index 0a74ef8e5127..781be5e52651 100644
--- a/include/svx/svdglue.hxx
+++ b/include/svx/svdglue.hxx
@@ -97,9 +97,9 @@ public:
 SdrAlign GetAlign() const   { return nAlign; }
 void SetAlign(SdrAlign nAlg){ nAlign=nAlg; }
 SdrAlign GetHorzAlign() const   { return nAlign & 
static_cast(0x00FF); }
-void SetHorzAlign(SdrAlign nAlg){ assert((nAlg & 
static_cast(0xff)) == SdrAlign::NONE); nAlign = SdrAlign(nAlign & 
static_cast(0xFF00)) | (nAlg & static_cast(0x00FF)); }
+void SetHorzAlign(SdrAlign nAlg){ assert((nAlg & 
static_cast(0xFF00)) == SdrAlign::NONE); nAlign = SdrAlign(nAlign & 
static_cast(0xFF00)) | (nAlg & static_cast(0x00FF)); }
 SdrAlign GetVertAlign() const   { return nAlign & 
static_cast(0xFF00); }
-void SetVertAlign(SdrAlign nAlg){ assert((nAlg & 
static_cast(0xff00)) == SdrAlign::NONE); nAlign = SdrAlign(nAlign & 
static_cast(0x00FF)) | (nAlg & static_cast(0xFF00)); }
+void SetVertAlign(SdrAlign nAlg){ assert((nAlg & 
static_cast(0x00FF)) == SdrAlign::NONE); nAlign = SdrAlign(nAlign & 
static_cast(0x00FF)) | (nAlg & static_cast(0xFF00)); }
 bool IsHit(const Point& rPnt, const OutputDevice& rOut, const 
SdrObject* pObj) const;
 void Invalidate(vcl::Window& rWin, const SdrObject* pObj) const;
 PointGetAbsolutePos(const SdrObject& rObj) const;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2018-01-20 Thread Stephan Bergmann 
 connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx |6 --
 1 file changed, 6 deletions(-)

New commits:
commit b670e88bc1505ef33d71da745ff96dac400ecb0f
Author: Stephan Bergmann 
Date:   Fri Jan 19 17:37:50 2018 +0100

loplugin:emptyif (macOS)

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

diff --git a/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx 
b/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx
index cda96cdcbf4e..0c09f95211e0 100644
--- a/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx
@@ -182,9 +182,6 @@ sal_Bool SAL_CALL 
MacabDatabaseMetaData::supportsNonNullableColumns(  )
 
 OUString SAL_CALL MacabDatabaseMetaData::getCatalogTerm(  )
 {
-if (m_bUseCatalog)
-{
-}
 return OUString();
 }
 
@@ -206,9 +203,6 @@ sal_Bool SAL_CALL 
MacabDatabaseMetaData::supportsDifferentTableCorrelationNames(
 
 sal_Bool SAL_CALL MacabDatabaseMetaData::isCatalogAtStart(  )
 {
-if (m_bUseCatalog)
-{
-}
 return false;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2018-01-20 Thread Stephan Bergmann 
 sc/inc/fillinfo.hxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 09dc5c51fa0de04e110190c08678758451b7f9c5
Author: Stephan Bergmann 
Date:   Fri Jan 19 18:39:38 2018 +0100

RowInfo copy ctor was presumably killed in error

...by 3c6b7c8b43d23dd7de46c02ee2cfa5bd2a97f168 "loplugin: unnecessary 
destructor
sc"

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

diff --git a/sc/inc/fillinfo.hxx b/sc/inc/fillinfo.hxx
index 53de02b0eca5..e21a11c9a088 100644
--- a/sc/inc/fillinfo.hxx
+++ b/sc/inc/fillinfo.hxx
@@ -174,6 +174,7 @@ const SCCOL SC_ROTMAX_NONE = SCCOL_MAX;
 struct RowInfo
 {
 RowInfo() = default;
+RowInfo(const RowInfo&) = delete;
 const RowInfo& operator=(const RowInfo&) = delete;
 
 CellInfo*   pCellInfo;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: avmedia/source bridges/source connectivity/source fpicker/source include/vcl jvmfwk/plugins lingucomponent/source sal/osl sd/source shell/source tools/source vcl/inc vc

2018-01-20 Thread Stephan Bergmann 
 avmedia/source/macavf/player.mm  |4 -
 bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx|2 
 connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx  |   28 +--
 connectivity/source/drivers/macab/MacabGroup.cxx |2 
 connectivity/source/drivers/macab/MacabHeader.cxx|2 
 connectivity/source/drivers/macab/MacabPreparedStatement.cxx |4 -
 connectivity/source/drivers/macab/MacabRecord.cxx|4 -
 connectivity/source/drivers/macab/MacabRecords.cxx   |   24 -
 connectivity/source/drivers/macab/MacabResultSetMetaData.cxx |2 
 connectivity/source/drivers/odbc/OConnection.cxx |4 -
 fpicker/source/aqua/AquaFilePickerDelegate.mm|4 -
 fpicker/source/aqua/ControlHelper.hxx|2 
 fpicker/source/aqua/ControlHelper.mm |   18 +++
 fpicker/source/aqua/FilterHelper.mm  |2 
 fpicker/source/aqua/SalAquaFilePicker.mm |4 -
 fpicker/source/aqua/SalAquaFolderPicker.mm   |2 
 fpicker/source/aqua/SalAquaPicker.mm |   12 ++--
 include/vcl/keycodes.hxx |   12 ++--
 jvmfwk/plugins/sunmajor/pluginlib/util_cocoa.mm  |4 -
 lingucomponent/source/spellcheck/macosxspell/macspellimp.mm  |4 -
 sal/osl/unx/file_volume.cxx  |2 
 sal/osl/unx/time.cxx |2 
 sd/source/ui/remotecontrol/BluetoothServer.cxx   |2 
 shell/source/backends/macbe/macbackend.mm|4 -
 tools/source/datetime/ttime.cxx  |2 
 vcl/inc/osx/salprn.h |2 
 vcl/osx/DragSource.cxx   |4 -
 vcl/osx/DropTarget.cxx   |6 +-
 vcl/osx/a11ycomponentwrapper.mm  |4 -
 vcl/osx/a11yfactory.mm   |   10 +--
 vcl/osx/a11ylistener.cxx |2 
 vcl/osx/a11yrolehelper.mm|2 
 vcl/osx/a11ytextattributeswrapper.mm |2 
 vcl/osx/a11ytextwrapper.mm   |6 +-
 vcl/osx/a11yutil.mm  |2 
 vcl/osx/a11yvaluewrapper.mm  |2 
 vcl/osx/a11ywrapper.mm   |   26 +-
 vcl/osx/a11ywrappercombobox.mm   |2 
 vcl/osx/a11ywrapperscrollarea.mm |4 -
 vcl/osx/printaccessoryview.mm|   28 +--
 vcl/osx/printview.mm |4 -
 vcl/osx/salframe.cxx |   10 +--
 vcl/osx/salframeview.mm  |6 +-
 vcl/osx/salinst.cxx  |2 
 vcl/osx/salmenu.cxx  |2 
 vcl/osx/salobj.cxx   |8 +--
 vcl/osx/vclnsapp.mm  |4 -
 vcl/quartz/ctfonts.cxx   |8 +--
 vcl/quartz/salbmp.cxx|8 +--
 vcl/quartz/salgdi.cxx|   18 +++
 vcl/quartz/salgdicommon.cxx  |   16 +++---
 vcl/source/fontsubset/sft.cxx|4 -
 52 files changed, 172 insertions(+), 172 deletions(-)

New commits:
commit fc528a468061e165ee29f0ca450245331da3ef93
Author: Stephan Bergmann 
Date:   Fri Jan 19 17:45:53 2018 +0100

More loplugin:cstylecast on macOS

Automatic rewrite (of loplugin:cstylecast and loplugin:unnecessaryparen) 
after
cab0427cadddb3aaf1349c66f2fa13a4234ba4b2 "Enable loplugin:cstylecast for 
some
more cases" and a409d32e7f6fc09e041079d6dbc3c927497adfed "More
loplugin:cstylecast"

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

diff --git a/avmedia/source/macavf/player.mm b/avmedia/source/macavf/player.mm
index 2df11fba099b..1d51ca276474 100644
--- a/avmedia/source/macavf/player.mm
+++ b/avmedia/source/macavf/player.mm
@@ -286,7 +286,7 @@ sal_Int16 SAL_CALL Player::getVolumeDB()
 //   0dB <-> AVPlayer volume 1.0
 const int nVolumeDB = (fVolume <= 0) ? -40 : lrint( 20.0*log10(fVolume));
 
-return (sal_Int16)nVolumeDB;
+return static_cast(nVolumeDB);
 }
 
 
@@ -298,7 +298,7 @@ awt::Size SAL_CALL Player::getPreferredPlayerWindowSize()
 NSArray* pVideoTracks = [pMovie tracksWithMediaType:AVMedi

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

2018-01-20 Thread Stephan Bergmann 
 include/basegfx/raster/bpixelraster.hxx |   10 +-
 1 file changed, 1 insertion(+), 9 deletions(-)

New commits:
commit 06bf579a007f33a1726197c92125b7475836e3ef
Author: Stephan Bergmann 
Date:   Fri Jan 19 11:54:51 2018 +0100

BPixel has a default ctor zero'ing its members

...so no need to do that again in the body of the BPixelRaster ctor (which 
had
needlessly been done ever since the code's introduction with
6f769fb8aaab1f899b3ca4551f6a8df2953cd938 "INTEGRATION: CWS aw033").  And
BPixelRaster::reset appears to have otherwise been unused, so can be 
removed.

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

diff --git a/include/basegfx/raster/bpixelraster.hxx 
b/include/basegfx/raster/bpixelraster.hxx
index 42620c7c01d7..b3f168754a8f 100644
--- a/include/basegfx/raster/bpixelraster.hxx
+++ b/include/basegfx/raster/bpixelraster.hxx
@@ -42,21 +42,13 @@ namespace basegfx
 std::unique_ptr   mpContent;
 
 public:
-// reset
-void reset()
-{
-memset(mpContent.get(), 0, sizeof(BPixel) * mnCount);
-}
-
 // constructor/destructor
 BPixelRaster(sal_uInt32 nWidth, sal_uInt32 nHeight)
 :   mnWidth(nWidth),
 mnHeight(nHeight),
 mnCount(nWidth * nHeight),
 mpContent(new BPixel[mnCount])
-{
-reset();
-}
+{}
 
 // coordinate calcs between X/Y and span
 sal_uInt32 getIndexFromXY(sal_uInt32 nX, sal_uInt32 nY) const { return 
(nX + (nY * mnWidth)); }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2018-01-20 Thread Stephan Bergmann 
 test/source/sheet/spreadsheetviewsettings.cxx |2 --
 1 file changed, 2 deletions(-)

New commits:
commit 0b87fdcad55d1927241073bc15c174168c5e0c1d
Author: Stephan Bergmann 
Date:   Fri Jan 19 17:38:25 2018 +0100

Remove dubious test

...that fails for me on at least one macOS and Windows machine each (with 
180
and 230, resp., instead of 116), and where it is unclear why only a value 
of 116
would be correct (and where that specific check was not present before
95307f2ca73480176634e5cc46d96a19b735e87b "tdf#45904 Move
_SpreadsheetViewSettings Java tests to C++", cf. my comment from 2018-01-17 
at
 "tdf#45904 Move
_SpreadsheetViewSettings Java tests to C++")

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

diff --git a/test/source/sheet/spreadsheetviewsettings.cxx 
b/test/source/sheet/spreadsheetviewsettings.cxx
index 9fb5d274f0d2..68f1d043d235 100644
--- a/test/source/sheet/spreadsheetviewsettings.cxx
+++ b/test/source/sheet/spreadsheetviewsettings.cxx
@@ -230,8 +230,6 @@ void 
SpreadsheetViewSettings::testSpreadsheetViewSettingsProperties()
 propName = "ZoomValue";
 sal_Int16 aZoomValue = 42;
 CPPUNIT_ASSERT(xSpreadsheetViewSettings->getPropertyValue(propName) >>= 
aZoomValue);
-CPPUNIT_ASSERT_EQUAL_MESSAGE("Unable to get PropertyValue ZoomValue", 
sal_Int16(116),
- aZoomValue);
 
 aNewValue <<= sal_Int16(1);
 xSpreadsheetViewSettings->setPropertyValue(propName, aNewValue);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

2018-01-20 Thread Adolfo Jayme Barrientos 
 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8b227f7d9ae623c0e516b07ced2b0e4e2728d68b
Author: Adolfo Jayme Barrientos 
Date:   Sat Jan 20 02:47:59 2018 -0600

Updated core
Project: help  237f881e17efb3091d93430fa287eab9b9d6b915

Some copyediting

• Fixing usage of phrasal verbs “check in” and “check out”
• Adding some missing prepositions
• Removing some pointless abbreviations
• Avoiding a reference to a “timer” that’s more precisely a stopwatch
  but not quite…

Change-Id: I37828f85065f17a16365caa45fd5913b771c4bec

diff --git a/helpcontent2 b/helpcontent2
index f8887d3de3a4..237f881e17ef 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit f8887d3de3a414cd677126484a56f7a29d88af67
+Subproject commit 237f881e17efb3091d93430fa287eab9b9d6b915
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2018-01-20 Thread Adolfo Jayme Barrientos 
 source/text/shared/00/0020.xhp   |2 -
 source/text/shared/01/01020001.xhp   |2 -
 source/text/shared/01/01060001.xhp   |2 -
 source/text/shared/01/05020200.xhp   |2 -
 source/text/shared/guide/cmis-remote-files.xhp   |   24 +++
 source/text/shared/guide/ms_user.xhp |4 +--
 source/text/shared/optionen/01041000.xhp |   10 -
 source/text/simpress/guide/presenter_console.xhp |2 -
 8 files changed, 24 insertions(+), 24 deletions(-)

New commits:
commit 237f881e17efb3091d93430fa287eab9b9d6b915
Author: Adolfo Jayme Barrientos 
Date:   Sat Jan 20 02:47:59 2018 -0600

Some copyediting

• Fixing usage of phrasal verbs “check in” and “check out”
• Adding some missing prepositions
• Removing some pointless abbreviations
• Avoiding a reference to a “timer” that’s more precisely a stopwatch
  but not quite…

Change-Id: I37828f85065f17a16365caa45fd5913b771c4bec

diff --git a/source/text/shared/00/0020.xhp 
b/source/text/shared/00/0020.xhp
index db92e06db..1a57d7038 100644
--- a/source/text/shared/00/0020.xhp
+++ b/source/text/shared/00/0020.xhp
@@ -60,7 +60,7 @@
 
 
 
-$[officename] Writer can read various versions of 
the Microsoft Word text format. You also can save your own texts in Word 
format. However, not everything available with $[officename] Writer can be 
transferred to MS Word, and not everything can be 
imported.
+$[officename] Writer can read various versions of 
the Microsoft Word text format. You also can save your own texts in Word 
format. However, not everything available with $[officename] Writer can be 
transferred to Word, and not everything can be 
imported.
 
 
 
diff --git a/source/text/shared/01/01020001.xhp 
b/source/text/shared/01/01020001.xhp
index 22e1e4bee..73d3dc4c7 100644
--- a/source/text/shared/01/01020001.xhp
+++ b/source/text/shared/01/01020001.xhp
@@ -31,7 +31,7 @@
 Long click on the Open icon and select Open 
Remote Files...
 
 
-A 
remote file server is web service that stores documents with or without 
check-in, check-out, version controls and backups.
+A 
remote file server is web service that stores documents with or without 
checkin, checkout, version controls and backups.
 
 Opening and saving files in remote servers
 
diff --git a/source/text/shared/01/01060001.xhp 
b/source/text/shared/01/01060001.xhp
index 40d9f2b03..3f9527031 100644
--- a/source/text/shared/01/01060001.xhp
+++ b/source/text/shared/01/01060001.xhp
@@ -30,7 +30,7 @@
 Long click on the Save icon and select Save 
Remote Files...
 
 
-A 
remote file server is a web service that stores documents with or without 
check-in, check-out, version controls and backups.
+A 
remote file server is a web service that stores documents with or without 
checkin, checkout, version controls and backups.
 
 Opening and saving files in remote servers
 
diff --git a/source/text/shared/01/05020200.xhp 
b/source/text/shared/01/05020200.xhp
index 2165973c9..f49ec9ee3 100644
--- a/source/text/shared/01/05020200.xhp
+++ b/source/text/shared/01/05020200.xhp
@@ -144,7 +144,7 @@
 
 Strikethrough
   Select a strikethrough style for the 
selected text.
-  If you save 
your document in MS Word format, all of the strikethrough styles are converted 
to the single line style.
+  If you save 
your document in Microsoft Word format, all of the strikethrough styles are 
converted to the single line style.
 
 Underlining
   Select the underlining style that you want 
to apply. To apply the underlining to words only, select the Individual 
Words box.
diff --git a/source/text/shared/guide/cmis-remote-files.xhp 
b/source/text/shared/guide/cmis-remote-files.xhp
index 856cac206..a9f62da3c 100644
--- a/source/text/shared/guide/cmis-remote-files.xhp
+++ b/source/text/shared/guide/cmis-remote-files.xhp
@@ -23,7 +23,7 @@
 
 Opening and saving files on 
remote servers
 Remote 
Files Service User Guide
-%PRODUCTNAME can open and save files stored on remote servers. 
Keeping files on remote servers allows to work with the documents using 
different computers. For example, you can work on a document in the office 
during the day and edit it at home for last-minute changes. Storing files on a 
remote server also backs up documents from computer loss or hard disk failure. 
Some servers are also able to check-in and check-out files, thus controlling 
their usage and access.
+%PRODUCTNAME can open and save files stored on remote servers. 
Keeping files on remote servers allows to work with the documents using 
different computers. For example, you can work on a document in the office 
during the day and edit it at home for last-minute changes. Storing files on a 
remote server also protects them from computer loss or hard disk failure. Some 
servers are also able to check in and check out

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

2018-01-20 Thread tagezi 
 sc/source/ui/view/cellsh1.cxx |   51 ++
 1 file changed, 22 insertions(+), 29 deletions(-)

New commits:
commit 22dc2e5cd3e06e12f08dbb86df2df86860d301d6
Author: tagezi 
Date:   Sat Dec 23 13:17:47 2017 +0200

tdf#39593 deduplicate code in ScCellShell

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

diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx
index 414f30bf9cac..4f075c981999 100644
--- a/sc/source/ui/view/cellsh1.cxx
+++ b/sc/source/ui/view/cellsh1.cxx
@@ -154,6 +154,26 @@ OUString FlagsToString( InsertDeleteFlags nFlags,
 }
 return aFlagsStr;
 }
+
+void SetTabNoAndCursor( const ScViewData* rViewData, const OUString& rCellId )
+{
+ScTabViewShell* pTabViewShell = rViewData->GetViewShell();
+assert(pTabViewShell);
+const ScDocument& rDoc = rViewData->GetDocShell()->GetDocument();
+std::vector aNotes;
+rDoc.GetAllNoteEntries(aNotes);
+
+sal_uInt32 nId = rCellId.toUInt32();
+auto lComp = [nId](const sc::NoteEntry& rNote) { return 
rNote.mpNote->GetId() == nId; };
+
+const auto& aFoundNoteIt = std::find_if(aNotes.begin(), aNotes.end(), 
lComp);
+if (aFoundNoteIt != aNotes.end())
+{
+ScAddress aFoundPos = aFoundNoteIt->maPos;
+pTabViewShell->SetTabNo(aFoundPos.Tab());
+pTabViewShell->SetCursor(aFoundPos.Col(), aFoundPos.Row());
+}
+}
 }
 
 void ScCellShell::ExecuteEdit( SfxRequest& rReq )
@@ -2190,21 +2210,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
 
 if (!aCellId.isEmpty())
 {
-
-ScDocument& rDoc = 
GetViewData()->GetDocShell()->GetDocument();
-std::vector aNotes;
-rDoc.GetAllNoteEntries(aNotes);
-
-sal_uInt32 nId = aCellId.toUInt32();
-auto lComp = [nId](const sc::NoteEntry& rNote) { 
return rNote.mpNote->GetId() == nId; };
-
-const auto& aFoundNoteIt = 
std::find_if(aNotes.begin(), aNotes.end(), lComp);
-if (aFoundNoteIt != aNotes.end())
-{
-ScAddress aFoundPos = aFoundNoteIt->maPos;
-pTabViewShell->SetTabNo(aFoundPos.Tab());
-pTabViewShell->SetCursor(aFoundPos.Col(), 
aFoundPos.Row());
-}
+SetTabNoAndCursor( GetViewData(), aCellId );
 }
 
 ScAddress aPos( GetViewData()->GetCurX(), 
GetViewData()->GetCurY(), GetViewData()->GetTabNo() );
@@ -2385,20 +2391,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
 OUString aCellId = pIdItem->GetValue();
 if (!aCellId.isEmpty())
 {
-ScDocument& rDoc = 
GetViewData()->GetDocShell()->GetDocument();
-std::vector aNotes;
-rDoc.GetAllNoteEntries(aNotes);
-
-sal_uInt32 nId = aCellId.toUInt32();
-auto lComp = [nId](const sc::NoteEntry& rNote) { return 
rNote.mpNote->GetId() == nId; };
-
-const auto& aFoundNoteIt = std::find_if(aNotes.begin(), 
aNotes.end(), lComp);
-if (aFoundNoteIt != aNotes.end())
-{
-ScAddress aFoundPos = aFoundNoteIt->maPos;
-pTabViewShell->SetTabNo(aFoundPos.Tab());
-pTabViewShell->SetCursor(aFoundPos.Col(), 
aFoundPos.Row());
-}
+SetTabNoAndCursor( GetViewData(), aCellId );
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: writerperfect/Library_wpftwriter.mk writerperfect/source

2018-01-20 Thread Miklos Vajna 
 writerperfect/Library_wpftwriter.mk  |2 ++
 writerperfect/source/writer/EPUBExportDialog.cxx |   17 +
 2 files changed, 19 insertions(+)

New commits:
commit cd2c076f6478c6f06f9834f599f6c65354039d60
Author: Miklos Vajna 
Date:   Fri Jan 19 11:39:01 2018 +0100

EPUB export UI: show remaining metadata from the doc model

Title is not special in any way, showing author/language/date has the
same benefits.

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

diff --git a/writerperfect/Library_wpftwriter.mk 
b/writerperfect/Library_wpftwriter.mk
index 34e85770d699..2ac6bd141cf2 100644
--- a/writerperfect/Library_wpftwriter.mk
+++ b/writerperfect/Library_wpftwriter.mk
@@ -32,8 +32,10 @@ $(eval $(call gb_Library_use_libraries,wpftwriter,\
comphelper \
cppu \
cppuhelper \
+   i18nlangtag \
vcl \
sal \
+   sax \
sfx \
sot \
svt \
diff --git a/writerperfect/source/writer/EPUBExportDialog.cxx 
b/writerperfect/source/writer/EPUBExportDialog.cxx
index 09ab58499a26..59e5cb4bf469 100644
--- a/writerperfect/source/writer/EPUBExportDialog.cxx
+++ b/writerperfect/source/writer/EPUBExportDialog.cxx
@@ -16,6 +16,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include "EPUBExportFilter.hxx"
 
@@ -136,8 +137,24 @@ EPUBExportDialog::EPUBExportDialog(vcl::Window *pParent, 
comphelper::SequenceAsH
 m_pTitle->SetText(xDP->getTitle());
 
 get(m_pInitialCreator, "author");
+if (xDP.is())
+m_pInitialCreator->SetText(xDP->getAuthor());
+
 get(m_pLanguage, "language");
+if (xDP.is())
+{
+OUString aLanguage(LanguageTag::convertToBcp47(xDP->getLanguage(), 
false));
+m_pLanguage->SetText(aLanguage);
+}
+
 get(m_pDate, "date");
+if (xDP.is())
+{
+OUStringBuffer aBuffer;
+util::DateTime aDate(xDP->getModificationDate());
+sax::Converter::convertDateTime(aBuffer, aDate, nullptr, true);
+m_pDate->SetText(aBuffer.makeStringAndClear());
+}
 
 get(m_pOKButton, "ok");
 m_pOKButton->SetClickHdl(LINK(this, EPUBExportDialog, OKClickHdl));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits