[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/docxsdrexport.cxx |6 ++
1 file changed, 2 insertions(+), 4 deletions(-)
New commits:
commit 623abd5df5e6a9932fc2a00d8790f288f19c9182
Author: Caolán McNamara
AuthorDate: Fri Feb 5 09:18:28 2021 +
Commit: Caolán McNamara
CommitDate: Sat Feb 6 11:00:43 2021 +0100
cid#1472784 Dereference null return value
Change-Id: Ifb6dc31b00ea170923d8cdb636185275e6877ca2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110457
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/sw/source/filter/ww8/docxsdrexport.cxx
b/sw/source/filter/ww8/docxsdrexport.cxx
index 27116bceb349..98f7c2d98e28 100644
--- a/sw/source/filter/ww8/docxsdrexport.cxx
+++ b/sw/source/filter/ww8/docxsdrexport.cxx
@@ -795,15 +795,13 @@ void DocxSdrExport::startDMLAnchorInline(const
SwFrameFormat* pFrameFormat, cons
m_pImpl->getSerializer()->endElementNS(XML_wp, nWrapToken);
}
}
-else
+else if (SdrObject* pSdrObj =
const_cast(pFrameFormat->FindRealSdrObject()))
{
// In this case we likely had an odt document to be exported to
docx.
// There is no grab-bag or something else so for a workaround,
// let's export the geometry of the shape...
// First get the UNO-shape
-uno::Reference xShape(
-
const_cast(pFrameFormat->FindRealSdrObject())->getUnoShape(),
-uno::UNO_QUERY);
+uno::Reference xShape(pSdrObj->getUnoShape(),
uno::UNO_QUERY);
if (xShape && xShape->getShapeType() ==
u"com.sun.star.drawing.CustomShape")
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/uibase/docvw/SidebarTxtControl.cxx | 25 -
1 file changed, 16 insertions(+), 9 deletions(-)
New commits:
commit e94784a54fa1995a23587fcb5493a24e62deda04
Author: Caolán McNamara
AuthorDate: Fri Feb 5 15:32:19 2021 +
Commit: Caolán McNamara
CommitDate: Sat Feb 6 11:01:01 2021 +0100
print struck-through 'deleted' comments with change-tracking enabled
in print comments in margins, the strike-through lines were missing in
the print out previous to this
Change-Id: I7f7f06d29b5f035a1e4996e1d89ce2b198b7a15c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110480
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/sw/source/uibase/docvw/SidebarTxtControl.cxx
b/sw/source/uibase/docvw/SidebarTxtControl.cxx
index bf3601cbe893..390ed80b0712 100644
--- a/sw/source/uibase/docvw/SidebarTxtControl.cxx
+++ b/sw/source/uibase/docvw/SidebarTxtControl.cxx
@@ -142,15 +142,22 @@ void SidebarTextControl::Draw(OutputDevice* pDev, const
Point& rPt, DrawFlags)
if ( mrSidebarWin.GetLayoutStatus()==SwPostItHelper::DELETED )
{
-SetLineColor(mrSidebarWin.GetChangeColor());
-pDev->DrawLine( PixelToLogic( GetPosPixel(), pDev->GetMapMode() ),
- PixelToLogic( GetPosPixel() +
-Point( GetSizePixel().Width(),
- GetSizePixel().Height() ),
pDev->GetMapMode() ) );
-pDev->DrawLine( PixelToLogic( GetPosPixel() +
-Point( GetSizePixel().Width(),0),
pDev->GetMapMode() ),
- PixelToLogic( GetPosPixel() +
-Point( 0, GetSizePixel().Height() ),
pDev->GetMapMode() ) );
+pDev->Push(PushFlags::LINECOLOR);
+
+pDev->SetLineColor(mrSidebarWin.GetChangeColor());
+Point aBottomRight(rPt);
+aBottomRight.Move(aSize);
+pDev->DrawLine(rPt, aBottomRight);
+
+Point aTopRight(rPt);
+aTopRight.Move(Size(aSize.Width(), 0));
+
+Point aBottomLeft(rPt);
+aBottomLeft.Move(Size(0, aSize.Height()));
+
+pDev->DrawLine(aTopRight, aBottomLeft);
+
+pDev->Pop();
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/gtk3/gtk3gtkinst.cxx | 55 ++-
1 file changed, 29 insertions(+), 26 deletions(-)
New commits:
commit 2c61782812b1b8b382dd48a04a712da9eaeb4685
Author: Caolán McNamara
AuthorDate: Fri Feb 5 16:01:23 2021 +
Commit: Caolán McNamara
CommitDate: Sat Feb 6 11:01:26 2021 +0100
complete TODO to keep color if font changes and vice versa
Change-Id: Ic38ed14ed67e477d97523b5a670528f5aa0f93f1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110482
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index 967531bfc4d4..529eb7881ac2 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -6823,21 +6823,20 @@ public:
}
};
-PangoAttrList* create_attr_list(const vcl::Font& rFont)
+void update_attr_list(PangoAttrList* pAttrList, const vcl::Font& rFont)
{
-PangoAttrList* pAttrList = pango_attr_list_new();
-pango_attr_list_insert(pAttrList,
pango_attr_family_new(OUStringToOString(rFont.GetFamilyName(),
RTL_TEXTENCODING_UTF8).getStr()));
-pango_attr_list_insert(pAttrList,
pango_attr_size_new(rFont.GetFontSize().Height() * PANGO_SCALE));
+pango_attr_list_change(pAttrList,
pango_attr_family_new(OUStringToOString(rFont.GetFamilyName(),
RTL_TEXTENCODING_UTF8).getStr()));
+pango_attr_list_change(pAttrList,
pango_attr_size_new(rFont.GetFontSize().Height() * PANGO_SCALE));
switch (rFont.GetItalic())
{
case ITALIC_NONE:
-pango_attr_list_insert(pAttrList,
pango_attr_style_new(PANGO_STYLE_NORMAL));
+pango_attr_list_change(pAttrList,
pango_attr_style_new(PANGO_STYLE_NORMAL));
break;
case ITALIC_NORMAL:
-pango_attr_list_insert(pAttrList,
pango_attr_style_new(PANGO_STYLE_ITALIC));
+pango_attr_list_change(pAttrList,
pango_attr_style_new(PANGO_STYLE_ITALIC));
break;
case ITALIC_OBLIQUE:
-pango_attr_list_insert(pAttrList,
pango_attr_style_new(PANGO_STYLE_OBLIQUE));
+pango_attr_list_change(pAttrList,
pango_attr_style_new(PANGO_STYLE_OBLIQUE));
break;
default:
break;
@@ -6845,19 +6844,19 @@ PangoAttrList* create_attr_list(const vcl::Font& rFont)
switch (rFont.GetWeight())
{
case WEIGHT_ULTRALIGHT:
-pango_attr_list_insert(pAttrList,
pango_attr_weight_new(PANGO_WEIGHT_ULTRALIGHT));
+pango_attr_list_change(pAttrList,
pango_attr_weight_new(PANGO_WEIGHT_ULTRALIGHT));
break;
case WEIGHT_LIGHT:
-pango_attr_list_insert(pAttrList,
pango_attr_weight_new(PANGO_WEIGHT_LIGHT));
+pango_attr_list_change(pAttrList,
pango_attr_weight_new(PANGO_WEIGHT_LIGHT));
break;
case WEIGHT_NORMAL:
-pango_attr_list_insert(pAttrList,
pango_attr_weight_new(PANGO_WEIGHT_NORMAL));
+pango_attr_list_change(pAttrList,
pango_attr_weight_new(PANGO_WEIGHT_NORMAL));
break;
case WEIGHT_BOLD:
-pango_attr_list_insert(pAttrList,
pango_attr_weight_new(PANGO_WEIGHT_BOLD));
+pango_attr_list_change(pAttrList,
pango_attr_weight_new(PANGO_WEIGHT_BOLD));
break;
case WEIGHT_ULTRABOLD:
-pango_attr_list_insert(pAttrList,
pango_attr_weight_new(PANGO_WEIGHT_ULTRABOLD));
+pango_attr_list_change(pAttrList,
pango_attr_weight_new(PANGO_WEIGHT_ULTRABOLD));
break;
default:
break;
@@ -6865,42 +6864,42 @@ PangoAttrList* create_attr_list(const vcl::Font& rFont)
switch (rFont.GetWidthType())
{
case WIDTH_ULTRA_CONDENSED:
-pango_attr_list_insert(pAttrList,
pango_attr_stretch_new(PANGO_STRETCH_ULTRA_CONDENSED));
+pango_attr_list_change(pAttrList,
pango_attr_stretch_new(PANGO_STRETCH_ULTRA_CONDENSED));
break;
case WIDTH_EXTRA_CONDENSED:
-pango_attr_list_insert(pAttrList,
pango_attr_stretch_new(PANGO_STRETCH_EXTRA_CONDENSED));
+pango_attr_list_change(pAttrList,
pango_attr_stretch_new(PANGO_STRETCH_EXTRA_CONDENSED));
break;
case WIDTH_CONDENSED:
-pango_attr_list_insert(pAttrList,
pango_attr_stretch_new(PANGO_STRETCH_CONDENSED));
+pango_attr_list_change(pAttrList,
pango_attr_stretch_new(PANGO_STRETCH_CONDENSED));
break;
case WIDTH_SEMI_CONDENSED:
-pango_attr_list_insert(pAttrList,
pango_attr_stretch_new(PANGO_STRETCH_SEMI_CONDENSED));
+pango_attr_list_change(pAttrList,
pango_attr_stretch_new(PANGO_STRETCH_SEMI_CONDENSED));
break;
case WIDTH_NORMAL:
-pango_attr_list_insert(pAttrList,
pango_attr_stretch_new(PANGO_STRETCH_NORMAL));
+pango_attr_list_change(pAttrList,
pango_attr_stretch_new(PANGO_STRETCH_NORMAL));
br
[Libreoffice-commits] core.git: desktop/qa solenv/clang-format solenv/sanitizers sw/inc sw/Library_sw.mk sw/qa sw/source sw/uiconfig sw/UIConfig_swriter.mk
desktop/qa/desktop_lib/test_desktop_lib.cxx | 36
solenv/clang-format/excludelist |3
solenv/sanitizers/ui/modules/swriter.suppr |1
sw/Library_sw.mk|2
sw/UIConfig_swriter.mk |2
sw/inc/AnnotationWin.hxx| 45 -
sw/qa/uitest/writer_tests/comments.py | 12
sw/qa/uitest/writer_tests/tdf137459_editeng_ctrl-DEL.py |5
sw/source/uibase/docvw/AnnotationMenuButton.cxx | 213 +---
sw/source/uibase/docvw/AnnotationMenuButton.hxx | 51 -
sw/source/uibase/docvw/AnnotationWin.cxx| 83 -
sw/source/uibase/docvw/AnnotationWin2.cxx | 696
sw/source/uibase/docvw/PostItMgr.cxx|5
sw/source/uibase/docvw/SidebarScrollBar.cxx | 73 -
sw/source/uibase/docvw/SidebarScrollBar.hxx | 40
sw/source/uibase/docvw/SidebarTxtControl.cxx| 328 +++
sw/source/uibase/docvw/SidebarTxtControl.hxx| 49 -
sw/source/uibase/docvw/SidebarTxtControlAcc.cxx | 271 --
sw/source/uibase/docvw/SidebarTxtControlAcc.hxx | 43
sw/uiconfig/swriter/ui/annotation.ui| 240 +
sw/uiconfig/swriter/ui/annotationmenu.ui| 95 --
21 files changed, 736 insertions(+), 1557 deletions(-)
New commits:
commit 69c546e1e7a697217f273baa7c1729ff823efd76
Author: Caolán McNamara
AuthorDate: Fri Dec 4 16:30:31 2020 +
Commit: Caolán McNamara
CommitDate: Sat Feb 6 12:16:04 2021 +0100
weld annotation window
note the labels in sw/uiconfig/swriter/ui/annotation.ui are deliberately
yaligned to 0 to retain the preexisting SwAnnotationWin::PaintTile hack
which
depends on this for bin/run gtktiledviewer --enable-tiled-annotations to
not show clipped author/date/etc labels
Change-Id: I53827aa98ed4d71d532a5993d21c6e22190b8063
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107264
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx
b/desktop/qa/desktop_lib/test_desktop_lib.cxx
index 8660906e5659..7a52bee8c6fa 100644
--- a/desktop/qa/desktop_lib/test_desktop_lib.cxx
+++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx
@@ -172,7 +172,6 @@ public:
void testTrackChanges();
void testRedlineCalc();
void testPaintPartTile();
-void testWriterCommentInsertCursor();
#if HAVE_MORE_FONTS
void testGetFontSubset();
#endif
@@ -234,7 +233,6 @@ public:
CPPUNIT_TEST(testTrackChanges);
CPPUNIT_TEST(testRedlineCalc);
CPPUNIT_TEST(testPaintPartTile);
-CPPUNIT_TEST(testWriterCommentInsertCursor);
#if HAVE_MORE_FONTS
CPPUNIT_TEST(testGetFontSubset);
#endif
@@ -2050,40 +2048,6 @@ void DesktopLOKTest::testPaintPartTile()
//CPPUNIT_ASSERT(aView1.m_bTilesInvalidated);
}
-void DesktopLOKTest::testWriterCommentInsertCursor()
-{
-// Load a document and type a character into the body text of the second
view.
-LibLODocument_Impl* pDocument = loadDoc("blank_text.odt");
-pDocument->m_pDocumentClass->initializeForRendering(pDocument, "{}");
-ViewCallback aView1(pDocument);
-pDocument->m_pDocumentClass->createView(pDocument);
-pDocument->m_pDocumentClass->initializeForRendering(pDocument, "{}");
-ViewCallback aView2(pDocument);
-pDocument->m_pDocumentClass->postKeyEvent(pDocument,
LOK_KEYEVENT_KEYINPUT, 'x', 0);
-pDocument->m_pDocumentClass->postKeyEvent(pDocument, LOK_KEYEVENT_KEYUP,
'x', 0);
-Scheduler::ProcessEventsToIdle();
-tools::Rectangle aBodyCursor = aView2.m_aOwnCursor;
-
-// Now insert a comment and make sure that the comment's cursor is shown,
-// not the body text's one.
-aView1.m_aOwnCursor.SetEmpty();
-const int nCtrlAltC = KEY_MOD1 + KEY_MOD2 + 512 + 'c' - 'a';
-pDocument->m_pDocumentClass->postKeyEvent(pDocument,
LOK_KEYEVENT_KEYINPUT, 'c', nCtrlAltC);
-pDocument->m_pDocumentClass->postKeyEvent(pDocument, LOK_KEYEVENT_KEYUP,
'c', nCtrlAltC);
-Scheduler::ProcessEventsToIdle();
-// Wait for SfxBindings to actually update the state, which updated the
-// cursor as well.
-osl::Thread::wait(std::chrono::seconds(1));
-Scheduler::ProcessEventsToIdle();
-// This failed: the body cursor was shown right after inserting a comment.
-CPPUNIT_ASSERT(aView2.m_aOwnCursor.getX() > aBodyCursor.getX());
-// This failed, the first view's cursor also jumped when the second view
-// inserted the comment.
-CPPUNIT_ASSERT(aView1.m_aOwnCursor.IsEmpty());
-
-Scheduler::ProcessEventsToIdle();
-}
-
#if HAVE_MORE_FONTS
void DesktopLOKTest::testGetFontSubset()
{
diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist
index 25d5fe43d99f..4bda736c6736 100644
--- a/solenv/clang-format/excludelist
+++ b/sol
[Libreoffice-commits] core.git: include/vcl solenv/clang-format toolkit/source vcl/inc vcl/source
include/vcl/toolkit/menubtn.hxx|9 +
include/vcl/toolkit/morebtn.hxx|5 +
solenv/clang-format/excludelist|2 +-
toolkit/source/awt/vclxtoolkit.cxx |2 +-
vcl/inc/managedmenubutton.hxx |2 +-
vcl/inc/menutogglebutton.hxx |2 +-
vcl/inc/salvtables.hxx |2 +-
vcl/source/app/salvtables.cxx |2 +-
vcl/source/control/menubtn.cxx |2 +-
vcl/source/uitest/uiobject.cxx |2 +-
vcl/source/window/builder.cxx |2 +-
11 files changed, 15 insertions(+), 17 deletions(-)
New commits:
commit 6245dba005eb35525886d16856b6e8cde9ddb105
Author: Caolán McNamara
AuthorDate: Sat Dec 5 20:59:42 2020 +
Commit: Caolán McNamara
CommitDate: Sat Feb 6 12:16:52 2021 +0100
move MenuButton to vcl/toolkit
Change-Id: I3f228c36e3f35ba54cab2ee87fcfbbae7992668d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107265
Tested-by: Caolán McNamara
Reviewed-by: Caolán McNamara
diff --git a/include/vcl/menubtn.hxx b/include/vcl/toolkit/menubtn.hxx
similarity index 95%
rename from include/vcl/menubtn.hxx
rename to include/vcl/toolkit/menubtn.hxx
index f32270161b8d..aecb6b04b468 100644
--- a/include/vcl/menubtn.hxx
+++ b/include/vcl/toolkit/menubtn.hxx
@@ -17,8 +17,11 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_MENUBTN_HXX
-#define INCLUDED_VCL_MENUBTN_HXX
+#pragma once
+
+#if !defined(VCL_DLLIMPLEMENTATION) && !defined(TOOLKIT_DLLIMPLEMENTATION) &&
!defined(VCL_INTERNALS)
+#error "don't use this in new code"
+#endif
#include
#include
@@ -91,6 +94,4 @@ public:
};
-#endif // INCLUDED_VCL_MENUBTN_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/vcl/toolkit/morebtn.hxx b/include/vcl/toolkit/morebtn.hxx
index b0648f443985..0195a996d7c5 100644
--- a/include/vcl/toolkit/morebtn.hxx
+++ b/include/vcl/toolkit/morebtn.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_VCL_MOREBTN_HXX
-#define INCLUDED_VCL_MOREBTN_HXX
+#pragma once
#if !defined(VCL_DLLIMPLEMENTATION) && !defined(TOOLKIT_DLLIMPLEMENTATION) &&
!defined(VCL_INTERNALS)
#error "don't use this in new code"
@@ -54,6 +53,4 @@ public:
using PushButton::SetState;
};
-#endif // INCLUDED_VCL_MOREBTN_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist
index 4bda736c6736..994e11dbad3d 100644
--- a/solenv/clang-format/excludelist
+++ b/solenv/clang-format/excludelist
@@ -6458,7 +6458,6 @@ include/vcl/lazydelete.hxx
include/vcl/lineinfo.hxx
include/vcl/mapmod.hxx
include/vcl/menu.hxx
-include/vcl/menubtn.hxx
include/vcl/metaact.hxx
include/vcl/metaactiontypes.hxx
include/vcl/metric.hxx
@@ -6523,6 +6522,7 @@ include/vcl/toolkit/imgctrl.hxx
include/vcl/toolkit/ivctrl.hxx
include/vcl/toolkit/longcurr.hxx
include/vcl/toolkit/lstbox.hxx
+include/vcl/toolkit/menubtn.hxx
include/vcl/toolkit/morebtn.hxx
include/vcl/toolkit/prgsbar.hxx
include/vcl/toolkit/roadmap.hxx
diff --git a/toolkit/source/awt/vclxtoolkit.cxx
b/toolkit/source/awt/vclxtoolkit.cxx
index 8d7cff46e7d8..31991a09fa17 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -103,7 +103,7 @@
#include
#include
#include
-#include
+#include
#include
#include
#include
diff --git a/vcl/inc/managedmenubutton.hxx b/vcl/inc/managedmenubutton.hxx
index d80655288215..d6e8f29321d8 100644
--- a/vcl/inc/managedmenubutton.hxx
+++ b/vcl/inc/managedmenubutton.hxx
@@ -9,7 +9,7 @@
#pragma once
-#include
+#include
#include
#include
diff --git a/vcl/inc/menutogglebutton.hxx b/vcl/inc/menutogglebutton.hxx
index e297926822d6..c1b5aef54498 100644
--- a/vcl/inc/menutogglebutton.hxx
+++ b/vcl/inc/menutogglebutton.hxx
@@ -19,7 +19,7 @@
#pragma once
-#include
+#include
class MenuToggleButton final : public MenuButton
{
diff --git a/vcl/inc/salvtables.hxx b/vcl/inc/salvtables.hxx
index 8f431002359d..981293d475d7 100644
--- a/vcl/inc/salvtables.hxx
+++ b/vcl/inc/salvtables.hxx
@@ -19,7 +19,7 @@
#include
#include
#include
-#include
+#include
#include
#include
#include
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index f983237dafed..ba13d7d1a180 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -55,7 +55,7 @@
#include
#include
#include
-#include
+#include
#include
#include
#include
diff --git a/vcl/source/control/menubtn.cxx b/vcl/source/control/menubtn.cxx
index a3c1cda1ce8b..bd21398796e9 100644
--- a/vcl/source/control/menubtn.cxx
+++ b/vcl/source/control/menubtn.cxx
@@ -22,7 +22,7 @@
#include
#include
#include
-#include
+#include
#include
#include
#include
diff --git a/vcl/source/uitest/uiobject.cxx b/vcl/source/uitest/uiobject.cxx
index 92122b54caab..ad514636fbd8 100644
--- a/vcl/source/uit
[Libreoffice-commits] core.git: accessibility/source include/vcl solenv/clang-format vcl/inc vcl/source vcl/workben
accessibility/source/standard/vclxaccessiblebutton.cxx |2
include/vcl/button.hxx | 231 -
include/vcl/toolkit/button.hxx | 206 +++
include/vcl/toolkit/menubtn.hxx|2
include/vcl/toolkit/morebtn.hxx|2
solenv/clang-format/excludelist|1
vcl/inc/pch/precompiled_vcl.hxx|1
vcl/source/control/DropdownBox.cxx |2
vcl/source/control/PriorityMergedHBox.cxx |2
vcl/workben/svpclient.cxx |2
10 files changed, 211 insertions(+), 240 deletions(-)
New commits:
commit 2b7a38bbf689e9872c0e739936e43953f105c01d
Author: Caolán McNamara
AuthorDate: Mon Dec 7 11:35:32 2020 +
Commit: Caolán McNamara
CommitDate: Sat Feb 6 12:17:22 2021 +0100
move Button to vcl/toolkit
Change-Id: I11e4fbab2e70342683febacf444fbe08dabf2417
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107346
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/accessibility/source/standard/vclxaccessiblebutton.cxx
b/accessibility/source/standard/vclxaccessiblebutton.cxx
index f0ade105ce27..4c912530f8bf 100644
--- a/accessibility/source/standard/vclxaccessiblebutton.cxx
+++ b/accessibility/source/standard/vclxaccessiblebutton.cxx
@@ -29,7 +29,7 @@
#include
#include
-#include
+#include
#include
#include
diff --git a/include/vcl/button.hxx b/include/vcl/button.hxx
deleted file mode 100644
index 6faf8dadc5b7..
--- a/include/vcl/button.hxx
+++ /dev/null
@@ -1,231 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * 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 .
- */
-
-#ifndef INCLUDED_VCL_BUTTON_HXX
-#define INCLUDED_VCL_BUTTON_HXX
-
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-
-namespace com::sun::star::frame { struct FeatureStateEvent; }
-template class VclPtr;
-
-class Color;
-class ImplCommonButtonData;
-enum class DrawButtonFlags;
-
-class VCL_DLLPUBLIC Button : public Control
-{
-private:
-std::unique_ptr mpButtonData;
-Link maClickHdl;
-
-/// Command URL (like .uno:Save) in case the button should handle it.
-OUString maCommand;
-
-Button (const Button &) = delete;
-Button & operator= (const Button &) =
delete;
-public:
-SAL_DLLPRIVATE DrawTextFlagsImplGetTextStyle( WinBits nWinStyle,
DrawFlags nDrawFlags );
-SAL_DLLPRIVATE void ImplDrawAlignedImage(OutputDevice* pDev,
Point& rPos, Size& rSize,
- sal_uLong nImageSep,
- DrawTextFlags nTextStyle,
tools::Rectangle *pSymbolRect=nullptr, bool bAddImageSep = false );
-SAL_DLLPRIVATE void ImplSetFocusRect( const tools::Rectangle
&rFocusRect );
-SAL_DLLPRIVATE const tools::Rectangle& ImplGetFocusRect() const;
-SAL_DLLPRIVATE void ImplSetSymbolAlign( SymbolAlign eAlign );
-/// The x-coordinate of the vertical separator line, use in MenuButton
subclass only.
-SAL_DLLPRIVATE tools::Long ImplGetSeparatorX() const;
-SAL_DLLPRIVATE void ImplSetSeparatorX( tools::Long nX );
-
-protected:
-explicitButton( WindowType nType );
-
-// for drawing RadioButton or CheckButton that has Text and/or Image
-SAL_DLLPRIVATE void ImplDrawRadioCheck(OutputDevice* pDev, WinBits
nWinStyle, DrawFlags nDrawFlags,
- const Point& rPos, const Size&
rSize,
- const Size& rImageSize,
tools::Rectangle& rStateRect,
- tools::Rectangle& rMouseRect);
-SAL_DLLPRIVATE tools::Long ImplGetImageToTextDistance() const;
-
-public:
-virtual~Button() override;
-virtual voiddispose() override;
-
-virtual voidClick();
-
-voidSetClickHdl( const Link& rLink ) {
maClickHdl = rLink
[Libreoffice-commits] help.git: source/text
source/text/scalc/main0103.xhp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 0477a955d5cafa8649e370fe10eb92e82e5e6313 Author: Olivier Hallot AuthorDate: Sat Feb 6 13:55:42 2021 +0100 Commit: Olivier Hallot CommitDate: Sat Feb 6 14:38:18 2021 +0100 typo Change-Id: Ia6fb4cf43bac6e9fda4c4498486c9a11f137b33d Reviewed-on: https://gerrit.libreoffice.org/c/help/+/110451 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/scalc/main0103.xhp b/source/text/scalc/main0103.xhp index 31ba401e6..ce84bb3e4 100644 --- a/source/text/scalc/main0103.xhp +++ b/source/text/scalc/main0103.xhp @@ -47,7 +47,7 @@ View Grid lines -Toggle the visibility of grid lines and for the current sheet. +Toggle the visibility of grid lines for the current sheet. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 14fabab6c74ac4581858eb7cf5311dd0cf8f4b0f Author: Olivier Hallot AuthorDate: Sat Feb 6 14:38:18 2021 +0100 Commit: Gerrit Code Review CommitDate: Sat Feb 6 14:38:18 2021 +0100 Update git submodules * Update helpcontent2 from branch 'master' to 0477a955d5cafa8649e370fe10eb92e82e5e6313 - typo Change-Id: Ia6fb4cf43bac6e9fda4c4498486c9a11f137b33d Reviewed-on: https://gerrit.libreoffice.org/c/help/+/110451 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index e42644369803..0477a955d5ca 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit e42644369803fbcff1f1c487616dad5bf9f11801 +Subproject commit 0477a955d5cafa8649e370fe10eb92e82e5e6313 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/shared/00/0406.xhp |2 +- source/text/shared/optionen/0101.xhp |2 +- source/text/shared/optionen/01010300.xhp |4 ++-- source/text/shared/optionen/01010301.xhp |2 +- 4 files changed, 5 insertions(+), 5 deletions(-) New commits: commit d733e4f5aa23c146d839c1128b4dab5b623b7fd7 Author: Johnny_M AuthorDate: Sat Feb 6 12:09:54 2021 +0100 Commit: Olivier Hallot CommitDate: Sat Feb 6 14:40:26 2021 +0100 tdf#132643 Translate German section IDs Change-Id: I13025f1d313a41ca70b1da7617a12ada7a840296 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/110499 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/shared/00/0406.xhp b/source/text/shared/00/0406.xhp index 230790ef7..189fff339 100644 --- a/source/text/shared/00/0406.xhp +++ b/source/text/shared/00/0406.xhp @@ -116,7 +116,7 @@ Choose %PRODUCTNAME - PreferencesTools - Options - $[officename] - General. Choose %PRODUCTNAME - PreferencesTools - Options - $[officename] - View. Choose %PRODUCTNAME - PreferencesTools - Options - $[officename] - Print. - + Choose %PRODUCTNAME - PreferencesTools - Options - $[officename] - Paths. Choose Tools - AutoText - Path. (autotext only) diff --git a/source/text/shared/optionen/0101.xhp b/source/text/shared/optionen/0101.xhp index c59ae24ce..5e63602f5 100644 --- a/source/text/shared/optionen/0101.xhp +++ b/source/text/shared/optionen/0101.xhp @@ -36,7 +36,7 @@ - + diff --git a/source/text/shared/optionen/01010300.xhp b/source/text/shared/optionen/01010300.xhp index 91e986d14..86f01a108 100644 --- a/source/text/shared/optionen/01010300.xhp +++ b/source/text/shared/optionen/01010300.xhp @@ -24,7 +24,7 @@ - + paths; defaults variables; for paths directories;directory structure @@ -36,7 +36,7 @@ This section contains the default paths to important folders in $[officename]. These paths can be edited by the user. - + Paths used by %PRODUCTNAME To modify an entry in this list, click the entry and click Edit. You can also double click the entry. diff --git a/source/text/shared/optionen/01010301.xhp b/source/text/shared/optionen/01010301.xhp index 9785760c1..a77b01d3b 100644 --- a/source/text/shared/optionen/01010301.xhp +++ b/source/text/shared/optionen/01010301.xhp @@ -28,7 +28,7 @@ Edit Paths In the Edit Paths dialog, you can select some folders that are available in $[officename]. - + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a21702d2d565c5f80899947808ba6decd4709f9b Author: Johnny_M AuthorDate: Sat Feb 6 14:40:26 2021 +0100 Commit: Gerrit Code Review CommitDate: Sat Feb 6 14:40:26 2021 +0100 Update git submodules * Update helpcontent2 from branch 'master' to d733e4f5aa23c146d839c1128b4dab5b623b7fd7 - tdf#132643 Translate German section IDs Change-Id: I13025f1d313a41ca70b1da7617a12ada7a840296 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/110499 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 0477a955d5ca..d733e4f5aa23 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 0477a955d5cafa8649e370fe10eb92e82e5e6313 +Subproject commit d733e4f5aa23c146d839c1128b4dab5b623b7fd7 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/shared/optionen/0107.xhp |2 +- source/text/shared/optionen/01070500.xhp |2 +- source/text/shared/optionen/0108.xhp |2 +- 3 files changed, 3 insertions(+), 3 deletions(-) New commits: commit 43d128655f812b7bff3a8a07ee43c92af9f52f61 Author: Johnny_M AuthorDate: Sat Feb 6 12:14:56 2021 +0100 Commit: Olivier Hallot CommitDate: Sat Feb 6 14:41:02 2021 +0100 tdf#132643 Translate German section IDs Change-Id: Ic49037f5049d5dd6c781264b7347af77e2a0c5c7 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/110501 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/shared/optionen/0107.xhp b/source/text/shared/optionen/0107.xhp index 4fbf4c223..581cc1a7e 100644 --- a/source/text/shared/optionen/0107.xhp +++ b/source/text/shared/optionen/0107.xhp @@ -36,7 +36,7 @@ - + diff --git a/source/text/shared/optionen/01070500.xhp b/source/text/shared/optionen/01070500.xhp index 57543a4b4..8ed7d2b4b 100644 --- a/source/text/shared/optionen/01070500.xhp +++ b/source/text/shared/optionen/01070500.xhp @@ -27,7 +27,7 @@ - + presentations; starting with wizard objects; always moveable (Impress/Draw) distorting in drawings diff --git a/source/text/shared/optionen/0108.xhp b/source/text/shared/optionen/0108.xhp index 114498263..58cb9bfc9 100644 --- a/source/text/shared/optionen/0108.xhp +++ b/source/text/shared/optionen/0108.xhp @@ -37,7 +37,7 @@ - + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit dfa90da14e5a6a3b6a131b0db58f8b131e4fb7e8 Author: Johnny_M AuthorDate: Sat Feb 6 14:41:02 2021 +0100 Commit: Gerrit Code Review CommitDate: Sat Feb 6 14:41:02 2021 +0100 Update git submodules * Update helpcontent2 from branch 'master' to 43d128655f812b7bff3a8a07ee43c92af9f52f61 - tdf#132643 Translate German section IDs Change-Id: Ic49037f5049d5dd6c781264b7347af77e2a0c5c7 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/110501 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index d733e4f5aa23..43d128655f81 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit d733e4f5aa23c146d839c1128b4dab5b623b7fd7 +Subproject commit 43d128655f812b7bff3a8a07ee43c92af9f52f61 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/shared/optionen/0106.xhp |2 +- source/text/shared/optionen/01060400.xhp |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 7208ded1ad2aee57714da8f578b62b7534cfc76c Author: Johnny_M AuthorDate: Sat Feb 6 12:17:23 2021 +0100 Commit: Olivier Hallot CommitDate: Sat Feb 6 14:41:35 2021 +0100 tdf#132643 Translate German section IDs Change-Id: I1e66c892dd879f9fa22d01ea9210aa1e4c56927e Reviewed-on: https://gerrit.libreoffice.org/c/help/+/110502 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/shared/optionen/0106.xhp b/source/text/shared/optionen/0106.xhp index 760ea8641..51311cc87 100644 --- a/source/text/shared/optionen/0106.xhp +++ b/source/text/shared/optionen/0106.xhp @@ -43,7 +43,7 @@ - + diff --git a/source/text/shared/optionen/01060400.xhp b/source/text/shared/optionen/01060400.xhp index 930217adb..4dc0427ea 100644 --- a/source/text/shared/optionen/01060400.xhp +++ b/source/text/shared/optionen/01060400.xhp @@ -27,7 +27,7 @@ - + Sort Lists ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e0398153caf838d06fbcb66daf3f1edde82fd611 Author: Johnny_M AuthorDate: Sat Feb 6 14:41:35 2021 +0100 Commit: Gerrit Code Review CommitDate: Sat Feb 6 14:41:35 2021 +0100 Update git submodules * Update helpcontent2 from branch 'master' to 7208ded1ad2aee57714da8f578b62b7534cfc76c - tdf#132643 Translate German section IDs Change-Id: I1e66c892dd879f9fa22d01ea9210aa1e4c56927e Reviewed-on: https://gerrit.libreoffice.org/c/help/+/110502 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 43d128655f81..7208ded1ad2a 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 43d128655f812b7bff3a8a07ee43c92af9f52f61 +Subproject commit 7208ded1ad2aee57714da8f578b62b7534cfc76c ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/shared/optionen/0101.xhp |4 ++-- source/text/shared/optionen/01010100.xhp |2 +- source/text/shared/optionen/01010600.xhp |2 +- 3 files changed, 4 insertions(+), 4 deletions(-) New commits: commit d04e933c1c9b4c6295cb9631d9b3832f90a9b43a Author: Johnny_M AuthorDate: Sat Feb 6 12:21:06 2021 +0100 Commit: Olivier Hallot CommitDate: Sat Feb 6 14:42:20 2021 +0100 tdf#132643 Translate German section IDs Change-Id: I17f025542ad7801b3805eb078178915eb5b7fbe7 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/110503 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/shared/optionen/0101.xhp b/source/text/shared/optionen/0101.xhp index 5e63602f5..c1fb3811c 100644 --- a/source/text/shared/optionen/0101.xhp +++ b/source/text/shared/optionen/0101.xhp @@ -32,8 +32,8 @@ - - + + diff --git a/source/text/shared/optionen/01010100.xhp b/source/text/shared/optionen/01010100.xhp index f06ad003e..81cf29f11 100644 --- a/source/text/shared/optionen/01010100.xhp +++ b/source/text/shared/optionen/01010100.xhp @@ -30,7 +30,7 @@ - + data; user data user data; input personal data input diff --git a/source/text/shared/optionen/01010600.xhp b/source/text/shared/optionen/01010600.xhp index e76745bc0..77e8e5b38 100644 --- a/source/text/shared/optionen/01010600.xhp +++ b/source/text/shared/optionen/01010600.xhp @@ -34,7 +34,7 @@ - + General Specifies the general settings for $[officename]. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit bda3775ca64490e2b506bf7c47bf12b7df887e70 Author: Johnny_M AuthorDate: Sat Feb 6 14:42:20 2021 +0100 Commit: Gerrit Code Review CommitDate: Sat Feb 6 14:42:20 2021 +0100 Update git submodules * Update helpcontent2 from branch 'master' to d04e933c1c9b4c6295cb9631d9b3832f90a9b43a - tdf#132643 Translate German section IDs Change-Id: I17f025542ad7801b3805eb078178915eb5b7fbe7 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/110503 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 7208ded1ad2a..d04e933c1c9b 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 7208ded1ad2aee57714da8f578b62b7534cfc76c +Subproject commit d04e933c1c9b4c6295cb9631d9b3832f90a9b43a ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/shared/01/05020301.xhp |2 +- source/text/shared/02/01170003.xhp |2 +- source/text/shared/optionen/01010600.xhp |2 +- 3 files changed, 3 insertions(+), 3 deletions(-) New commits: commit a826a96c71ff9c8c2ed3c273f15bdedb980452a0 Author: Johnny_M AuthorDate: Sat Feb 6 12:27:36 2021 +0100 Commit: Olivier Hallot CommitDate: Sat Feb 6 14:43:03 2021 +0100 tdf#132643 Translate German section IDs Change-Id: I78cfaed1970b624acf13fa9c24656928790e6912 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/110504 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/shared/01/05020301.xhp b/source/text/shared/01/05020301.xhp index 172d1ab33..5ea91321e 100644 --- a/source/text/shared/01/05020301.xhp +++ b/source/text/shared/01/05020301.xhp @@ -889,7 +889,7 @@ The Date & Time format displays the date and time that an entry was made to a cell with this format. - + By default in %PRODUCTNAME, a date with the value "0" corresponds to Dec 30, 1899. diff --git a/source/text/shared/02/01170003.xhp b/source/text/shared/02/01170003.xhp index 01f45f392..6ad9fe89d 100644 --- a/source/text/shared/02/01170003.xhp +++ b/source/text/shared/02/01170003.xhp @@ -28,6 +28,6 @@ date fields; propertiesSpecial Tips for Date Fields When you enter a year using two digits, the corresponding four digit value is determined by a setting in %PRODUCTNAME - PreferencesTools - Options - $[officename] - General. For example, if 1935 is set as the lower limiting value and you enter 34 as a date value, then the result is 2034 instead of 1934. The pre-set limit value will be saved for each document. - + diff --git a/source/text/shared/optionen/01010600.xhp b/source/text/shared/optionen/01010600.xhp index 77e8e5b38..abf1488e0 100644 --- a/source/text/shared/optionen/01010600.xhp +++ b/source/text/shared/optionen/01010600.xhp @@ -54,7 +54,7 @@ Year (two digits) Defines a date range, within which the system recognizes a two-digit year. - + In $[officename], years are indicated by four digits, so that the difference between 1/1/99 and 1/1/01 is two years. This Year (two digits) setting allows the user to define the years in which two-digit dates are added to 2000. To illustrate, if you specify a date of 1/1/30 or later, the entry "1/1/20" is recognized as 1/1/2020 instead of 1/1/1920. Help Improve %PRODUCTNAME ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 77617104d622bc13bdfb39d6c14c564daaff8031 Author: Johnny_M AuthorDate: Sat Feb 6 14:43:03 2021 +0100 Commit: Gerrit Code Review CommitDate: Sat Feb 6 14:43:03 2021 +0100 Update git submodules * Update helpcontent2 from branch 'master' to a826a96c71ff9c8c2ed3c273f15bdedb980452a0 - tdf#132643 Translate German section IDs Change-Id: I78cfaed1970b624acf13fa9c24656928790e6912 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/110504 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index d04e933c1c9b..a826a96c71ff 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit d04e933c1c9b4c6295cb9631d9b3832f90a9b43a +Subproject commit a826a96c71ff9c8c2ed3c273f15bdedb980452a0 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/shared/optionen/0105.xhp |2 +- source/text/shared/optionen/01050300.xhp |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 75e5c818d1d3dd1f8f4c154206a88af5432e8e92 Author: Johnny_M AuthorDate: Sat Feb 6 12:29:32 2021 +0100 Commit: Olivier Hallot CommitDate: Sat Feb 6 14:44:05 2021 +0100 tdf#132643 Translate German section IDs Change-Id: I201c277b87067053790fa658b28c7fe4f4a49535 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/110505 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/shared/optionen/0105.xhp b/source/text/shared/optionen/0105.xhp index aa5586ac7..c2b5e8713 100644 --- a/source/text/shared/optionen/0105.xhp +++ b/source/text/shared/optionen/0105.xhp @@ -43,7 +43,7 @@ - + diff --git a/source/text/shared/optionen/01050300.xhp b/source/text/shared/optionen/01050300.xhp index dc5a70e4f..349b93802 100644 --- a/source/text/shared/optionen/01050300.xhp +++ b/source/text/shared/optionen/01050300.xhp @@ -27,7 +27,7 @@ - + Background Specifies the background for HTML documents. The background is valid for both new HTML documents and for those that you load, as long as these have not defined their own background. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ef047ea1244bdb19cc5169b685943d5e7396f2d4 Author: Johnny_M AuthorDate: Sat Feb 6 14:44:05 2021 +0100 Commit: Gerrit Code Review CommitDate: Sat Feb 6 14:44:05 2021 +0100 Update git submodules * Update helpcontent2 from branch 'master' to 75e5c818d1d3dd1f8f4c154206a88af5432e8e92 - tdf#132643 Translate German section IDs Change-Id: I201c277b87067053790fa658b28c7fe4f4a49535 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/110505 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index a826a96c71ff..75e5c818d1d3 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit a826a96c71ff9c8c2ed3c273f15bdedb980452a0 +Subproject commit 75e5c818d1d3dd1f8f4c154206a88af5432e8e92 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/shared/01/01010303.xhp | 10 +- source/text/shared/01/01010304.xhp | 10 +- source/text/shared/optionen/01010100.xhp | 14 +++--- 3 files changed, 17 insertions(+), 17 deletions(-) New commits: commit 824f851d92f53e84775b1546f523c0e1097eac64 Author: Johnny_M AuthorDate: Sat Feb 6 12:53:57 2021 +0100 Commit: Olivier Hallot CommitDate: Sat Feb 6 14:46:31 2021 +0100 tdf#132643 Translate German section IDs Change-Id: Icf0721cdb2ac730d28ba17ecdb1962a55fbcb883 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/110506 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/shared/01/01010303.xhp b/source/text/shared/01/01010303.xhp index fc3038ae7..92262fcb5 100644 --- a/source/text/shared/01/01010303.xhp +++ b/source/text/shared/01/01010303.xhp @@ -35,7 +35,7 @@ Private data Enter the contact information that you want to include on your business card. You can also modify or update these entries by choosing %PRODUCTNAME - PreferencesTools - Options - $[officename] - User Data. - + First name 2 Enter the first name of the person, whom you want to use as a second contact. @@ -45,11 +45,11 @@ Initials 2 Enter the initials of the person, whom you want to use as a second contact. - + Country Enter the name of the country in which you live. - + Profession Enter the title of your profession. @@ -59,10 +59,10 @@ Mobile Enter your mobile telephone number. - + Homepage Enter the address of your internet homepage. - + diff --git a/source/text/shared/01/01010304.xhp b/source/text/shared/01/01010304.xhp index d71fc2917..2a01307ec 100644 --- a/source/text/shared/01/01010304.xhp +++ b/source/text/shared/01/01010304.xhp @@ -40,28 +40,28 @@ Business data Enter the contact information that you want to include on your business card. If you want to include your name on a business card, enter your name on the Private tab. Then choose a layout on the Business Cards tab that includes a name placeholder. - + Company 2nd line Enter additional company details. Slogan Enter the slogan of your company. - + Country Enter the name of the country where your business is located. - + Phone Enter your business telephone number. Mobile Enter your mobile telephone number. - + Homepage Enter the address of your company's internet homepage. - + diff --git a/source/text/shared/optionen/01010100.xhp b/source/text/shared/optionen/01010100.xhp index 81cf29f11..35ed809b6 100644 --- a/source/text/shared/optionen/01010100.xhp +++ b/source/text/shared/optionen/01010100.xhp @@ -48,13 +48,13 @@ User data is also used when commenting and in tracking changes mode, to identify comments/edits author; and to mark last edit position in document, so that when author opens the document later, it opens at the last edit position. Address Use the Address field to enter and edit your personal user data. - + Company Type the name of your company in this field. - + @@ -74,7 +74,7 @@ Initials Type your initials. - + @@ -99,13 +99,13 @@ State Type your state. - + Title Type your title in this field. - + Position @@ -117,14 +117,14 @@ Tel. (Work) Type your work number in this field. - + Fax Type your fax number in this field. - + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 29edb4faaff2b59cd34338566c51d2e81ceec379 Author: Johnny_M AuthorDate: Sat Feb 6 14:46:31 2021 +0100 Commit: Gerrit Code Review CommitDate: Sat Feb 6 14:46:31 2021 +0100 Update git submodules * Update helpcontent2 from branch 'master' to 824f851d92f53e84775b1546f523c0e1097eac64 - tdf#132643 Translate German section IDs Change-Id: Icf0721cdb2ac730d28ba17ecdb1962a55fbcb883 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/110506 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 75e5c818d1d3..824f851d92f5 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 75e5c818d1d3dd1f8f4c154206a88af5432e8e92 +Subproject commit 824f851d92f53e84775b1546f523c0e1097eac64 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/shared/optionen/01040900.xhp |2 +- source/text/shared/optionen/01060300.xhp |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit ba779828d2ccc65973ab8d3a14f63c014fdff38a Author: Johnny_M AuthorDate: Sat Feb 6 12:54:48 2021 +0100 Commit: Olivier Hallot CommitDate: Sat Feb 6 14:47:05 2021 +0100 tdf#132643 Translate German section IDs Change-Id: I7ebf4ef926a45aa02dd6ed601c5fe26944ff1232 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/110507 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/shared/optionen/01040900.xhp b/source/text/shared/optionen/01040900.xhp index 6b38a0b06..262b01c1b 100644 --- a/source/text/shared/optionen/01040900.xhp +++ b/source/text/shared/optionen/01040900.xhp @@ -56,7 +56,7 @@ - + Update diff --git a/source/text/shared/optionen/01060300.xhp b/source/text/shared/optionen/01060300.xhp index acaa0388e..b5fbabe1d 100644 --- a/source/text/shared/optionen/01060300.xhp +++ b/source/text/shared/optionen/01060300.xhp @@ -53,7 +53,7 @@ Defines the unit of measure in spreadsheets. Tab stops Defines the tab stops distance. - + Input settings Press Enter to move selection ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 3f654de2345a43379e0e778435f6bba11ed7a775 Author: Johnny_M AuthorDate: Sat Feb 6 14:47:05 2021 +0100 Commit: Gerrit Code Review CommitDate: Sat Feb 6 14:47:05 2021 +0100 Update git submodules * Update helpcontent2 from branch 'master' to ba779828d2ccc65973ab8d3a14f63c014fdff38a - tdf#132643 Translate German section IDs Change-Id: I7ebf4ef926a45aa02dd6ed601c5fe26944ff1232 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/110507 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 824f851d92f5..ba779828d2cc 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 824f851d92f53e84775b1546f523c0e1097eac64 +Subproject commit ba779828d2ccc65973ab8d3a14f63c014fdff38a ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/sdraw/main0213.xhp |2 +- source/text/shared/optionen/01050100.xhp |2 +- source/text/simpress/main0213.xhp|2 +- 3 files changed, 3 insertions(+), 3 deletions(-) New commits: commit ae7a7dd416051bfa975278654a53f4a457f81d6e Author: Johnny_M AuthorDate: Sat Feb 6 12:58:39 2021 +0100 Commit: Olivier Hallot CommitDate: Sat Feb 6 14:47:43 2021 +0100 tdf#132643 Translate German section IDs Change-Id: I98d3445b37b7b744df7363f1f0098aec27c5203e Reviewed-on: https://gerrit.libreoffice.org/c/help/+/110508 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/sdraw/main0213.xhp b/source/text/sdraw/main0213.xhp index 5093d23f7..c8b3ba8ed 100644 --- a/source/text/sdraw/main0213.xhp +++ b/source/text/sdraw/main0213.xhp @@ -43,7 +43,7 @@ Snap to Grid - + Snap to Snap Guides diff --git a/source/text/shared/optionen/01050100.xhp b/source/text/shared/optionen/01050100.xhp index 2cfba0ec1..d0325ecb6 100644 --- a/source/text/shared/optionen/01050100.xhp +++ b/source/text/shared/optionen/01050100.xhp @@ -43,7 +43,7 @@ Grid Snap to grid - + Specifies whether to move frames, drawing elements, and controls only between grid points. To change the status of the snap grip only for the current action, drag an object while holding down the Control key Ctrl key. diff --git a/source/text/simpress/main0213.xhp b/source/text/simpress/main0213.xhp index 7be03e4d7..4ee7dea7c 100644 --- a/source/text/simpress/main0213.xhp +++ b/source/text/simpress/main0213.xhp @@ -46,7 +46,7 @@ Snap to Grid - + Snap to Snap Lines ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d4c2bf174ce73eb869894c0618f61652804fe22a Author: Johnny_M AuthorDate: Sat Feb 6 14:47:43 2021 +0100 Commit: Gerrit Code Review CommitDate: Sat Feb 6 14:47:43 2021 +0100 Update git submodules * Update helpcontent2 from branch 'master' to ae7a7dd416051bfa975278654a53f4a457f81d6e - tdf#132643 Translate German section IDs Change-Id: I98d3445b37b7b744df7363f1f0098aec27c5203e Reviewed-on: https://gerrit.libreoffice.org/c/help/+/110508 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index ba779828d2cc..ae7a7dd41605 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit ba779828d2ccc65973ab8d3a14f63c014fdff38a +Subproject commit ae7a7dd416051bfa975278654a53f4a457f81d6e ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/shared/optionen/0104.xhp |2 +- source/text/shared/optionen/0105.xhp |2 +- source/text/shared/optionen/01050100.xhp |2 +- source/text/shared/optionen/0106.xhp |2 +- source/text/shared/optionen/01070300.xhp |2 +- 5 files changed, 5 insertions(+), 5 deletions(-) New commits: commit 6f5ef67bda3b22ba2f2fd31ab32c2e2cc88f5c6b Author: Johnny_M AuthorDate: Sat Feb 6 13:01:04 2021 +0100 Commit: Olivier Hallot CommitDate: Sat Feb 6 14:48:33 2021 +0100 tdf#132643 Translate German section IDs Change-Id: I076c6306f60ecb08821cc54c9d8b699b97276b49 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/110509 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/shared/optionen/0104.xhp b/source/text/shared/optionen/0104.xhp index c9047216b..b81785b83 100644 --- a/source/text/shared/optionen/0104.xhp +++ b/source/text/shared/optionen/0104.xhp @@ -40,7 +40,7 @@ - + Basic Fonts (Western) Specifies the settings for the basic fonts. Basic Fonts (Asian) diff --git a/source/text/shared/optionen/0105.xhp b/source/text/shared/optionen/0105.xhp index c2b5e8713..0d8d2293b 100644 --- a/source/text/shared/optionen/0105.xhp +++ b/source/text/shared/optionen/0105.xhp @@ -40,7 +40,7 @@ - + diff --git a/source/text/shared/optionen/01050100.xhp b/source/text/shared/optionen/01050100.xhp index d0325ecb6..2986e1877 100644 --- a/source/text/shared/optionen/01050100.xhp +++ b/source/text/shared/optionen/01050100.xhp @@ -27,7 +27,7 @@ - + grids; defaults (Writer/Calc) defaults; grids (Writer/Calc) snap grid defaults (Writer/Calc) diff --git a/source/text/shared/optionen/0106.xhp b/source/text/shared/optionen/0106.xhp index 51311cc87..830570223 100644 --- a/source/text/shared/optionen/0106.xhp +++ b/source/text/shared/optionen/0106.xhp @@ -46,7 +46,7 @@ - + diff --git a/source/text/shared/optionen/01070300.xhp b/source/text/shared/optionen/01070300.xhp index 068b31fdd..5adbabb0f 100644 --- a/source/text/shared/optionen/01070300.xhp +++ b/source/text/shared/optionen/01070300.xhp @@ -35,7 +35,7 @@ - + If you have activated the snap grid but wish to move or create individual objects without constraining them, keep the Shift key pressed to deactivate this function for as long as needed. Snap ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 938e65fab4a6ed64a64ae911ee03cb9a33367934 Author: Johnny_M AuthorDate: Sat Feb 6 14:48:33 2021 +0100 Commit: Gerrit Code Review CommitDate: Sat Feb 6 14:48:33 2021 +0100 Update git submodules * Update helpcontent2 from branch 'master' to 6f5ef67bda3b22ba2f2fd31ab32c2e2cc88f5c6b - tdf#132643 Translate German section IDs Change-Id: I076c6306f60ecb08821cc54c9d8b699b97276b49 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/110509 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index ae7a7dd41605..6f5ef67bda3b 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit ae7a7dd416051bfa975278654a53f4a457f81d6e +Subproject commit 6f5ef67bda3b22ba2f2fd31ab32c2e2cc88f5c6b ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/shared/optionen/0107.xhp |2 +- source/text/shared/optionen/01070300.xhp |2 +- source/text/shared/optionen/0108.xhp |2 +- 3 files changed, 3 insertions(+), 3 deletions(-) New commits: commit 4d729a974b430318ea296148805a3bb02dfb95e5 Author: Johnny_M AuthorDate: Sat Feb 6 12:11:39 2021 +0100 Commit: Olivier Hallot CommitDate: Sat Feb 6 14:49:09 2021 +0100 tdf#132643 Translate German section IDs Change-Id: I1619486a82b8e7739de40f4910bf2d0e179fc308 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/110500 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/shared/optionen/0107.xhp b/source/text/shared/optionen/0107.xhp index 581cc1a7e..ef698f054 100644 --- a/source/text/shared/optionen/0107.xhp +++ b/source/text/shared/optionen/0107.xhp @@ -38,7 +38,7 @@ - + diff --git a/source/text/shared/optionen/01070300.xhp b/source/text/shared/optionen/01070300.xhp index 5adbabb0f..15c7b8c49 100644 --- a/source/text/shared/optionen/01070300.xhp +++ b/source/text/shared/optionen/01070300.xhp @@ -25,7 +25,7 @@ - + snapping in presentations and drawings points;reducing editing points when snapping (Impress/Draw) diff --git a/source/text/shared/optionen/0108.xhp b/source/text/shared/optionen/0108.xhp index 58cb9bfc9..17d7fb087 100644 --- a/source/text/shared/optionen/0108.xhp +++ b/source/text/shared/optionen/0108.xhp @@ -39,7 +39,7 @@ - + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ca387c4b7b21e4f6b28b82f42b6c7f859c7e324a Author: Johnny_M AuthorDate: Sat Feb 6 14:49:09 2021 +0100 Commit: Gerrit Code Review CommitDate: Sat Feb 6 14:49:09 2021 +0100 Update git submodules * Update helpcontent2 from branch 'master' to 4d729a974b430318ea296148805a3bb02dfb95e5 - tdf#132643 Translate German section IDs Change-Id: I1619486a82b8e7739de40f4910bf2d0e179fc308 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/110500 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 6f5ef67bda3b..4d729a974b43 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 6f5ef67bda3b22ba2f2fd31ab32c2e2cc88f5c6b +Subproject commit 4d729a974b430318ea296148805a3bb02dfb95e5 ___ 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
sw/qa/extras/ww8export/data/gutter-top.doc |binary
sw/qa/extras/ww8export/ww8export3.cxx | 14 ++
sw/source/filter/ww8/wrtww8.cxx|5 +
sw/source/filter/ww8/ww8par.cxx|5 +
sw/source/filter/ww8/ww8par.hxx|2 +-
sw/source/filter/ww8/ww8par6.cxx |4
sw/source/filter/ww8/ww8scan.cxx |5 +
7 files changed, 30 insertions(+), 5 deletions(-)
New commits:
commit e1d217b086e8c47efc5ced4c490062956d564e3f
Author: Miklos Vajna
AuthorDate: Fri Feb 5 17:03:08 2021 +0100
Commit: Miklos Vajna
CommitDate: Sat Feb 6 15:16:13 2021 +0100
tdf#91920 sw page gutter margin, from top: add DOC filter
But leave the fRTLGutter case alone for now, I can't find the Word UI
for that.
Change-Id: I1d97e85308aa13892f50c0fcd3680cec514ef566
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110471
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/sw/qa/extras/ww8export/data/gutter-top.doc
b/sw/qa/extras/ww8export/data/gutter-top.doc
new file mode 100644
index ..07ffa3945ac5
Binary files /dev/null and b/sw/qa/extras/ww8export/data/gutter-top.doc differ
diff --git a/sw/qa/extras/ww8export/ww8export3.cxx
b/sw/qa/extras/ww8export/ww8export3.cxx
index 2eb5c361f8ac..a4e4c552a93a 100644
--- a/sw/qa/extras/ww8export/ww8export3.cxx
+++ b/sw/qa/extras/ww8export/ww8export3.cxx
@@ -106,6 +106,20 @@ DECLARE_WW8EXPORT_TEST(testGutterLeft, "gutter-left.doc")
CPPUNIT_ASSERT_EQUAL(static_cast(1270), nGutterMargin);
}
+CPPUNIT_TEST_FIXTURE(Test, testGutterTop)
+{
+load(mpTestDocumentPath, "gutter-top.doc");
+reload(mpFilter, "gutter-top.doc");
+uno::Reference xFactory(mxComponent,
uno::UNO_QUERY);
+uno::Reference xSettings(
+xFactory->createInstance("com.sun.star.document.Settings"),
uno::UNO_QUERY);
+bool bGutterAtTop{};
+xSettings->getPropertyValue("GutterAtTop") >>= bGutterAtTop;
+// Without the accompanying fix in place, this test would have failed,
becase the gutter was
+// at the left.
+CPPUNIT_ASSERT(bGutterAtTop);
+}
+
DECLARE_WW8EXPORT_TEST(testArabicZeroNumbering, "arabic-zero-numbering.doc")
{
auto xNumberingRules
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index 26ef68865bda..bab71c2cff39 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -523,6 +523,11 @@ static void WriteDop( WW8Export& rWrt )
rDop.fProtEnabled = false;
}
+if
(rWrt.m_rDoc.getIDocumentSettingAccess().get(DocumentSettingId::GUTTER_AT_TOP))
+{
+rDop.iGutterPos = true;
+}
+
if (!xDocProps.is())
{
rDop.dttmCreated = rDop.dttmRevised = rDop.dttmLastPrint = 0x45FBAC69;
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index ea9e4a42d728..10430ebdefc1 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -1957,6 +1957,11 @@ void SwWW8ImplReader::ImportDop()
const SvtFilterOptions& rOpt = SvtFilterOptions::Get();
if (rOpt.IsUseEnhancedFields())
m_rDoc.getIDocumentSettingAccess().set(DocumentSettingId::PROTECT_FORM,
m_xWDop->fProtEnabled );
+
+if (m_xWDop->iGutterPos)
+{
+
m_rDoc.getIDocumentSettingAccess().set(DocumentSettingId::GUTTER_AT_TOP, true);
+}
}
void SwWW8ImplReader::ImportDopTypography(const WW8DopTypography &rTypo)
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index a8370dd84f41..c4c60f30f586 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -870,7 +870,7 @@ private:
static bool SetCols(SwFrameFormat &rFormat, const wwSection &rSection,
sal_uInt32 nNetWidth);
bool SectionIsProtected(const wwSection &rSection) const;
-void SetLeftRight(wwSection &rSection);
+static void SetLeftRight(wwSection &rSection);
/*
The segment we're inserting, the start of the segments container, and the
nodeindex of where we want the page break to (normally the segments start
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index e7b2ba75d8b2..44acfec4b3fb 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -486,10 +486,6 @@ void wwSectionManager::SetLeftRight(wwSection &rSection)
nWWRi += nWWGu;
nWWGu = 0;
}
-else if (mrReader.m_xWDop->iGutterPos)
-{
-nWWGu = 0;
-}
// Left / Right
if ((rSection.nPgWidth - nWWLe - nWWRi) < MINLAY)
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index 302c6c62318d..fcd932afb62d 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -8211,6 +8211,11 @@ void WW8Dop::Write(SvStream& rStrm, WW8Fib& rFib) const
a16Bit |= 0x0007;
a16Bit |= (0x0ff8 & (wScaleSaved << 3));
a16Bit |= (0x30
[Libreoffice-commits] core.git: include/svtools sw/qa sw/source writerfilter/source
include/svtools/rtfkeywd.hxx |1 +
sw/qa/extras/rtfexport/data/gutter-top.rtf |4
sw/qa/extras/rtfexport/rtfexport4.cxx | 14 ++
sw/source/filter/ww8/rtfexport.cxx |7 +++
writerfilter/source/rtftok/rtfdispatchflag.cxx |3 +++
5 files changed, 29 insertions(+)
New commits:
commit faf0635def4ef603563f7288cb29d24e3f2ce1e3
Author: Miklos Vajna
AuthorDate: Fri Feb 5 17:27:26 2021 +0100
Commit: Miklos Vajna
CommitDate: Sat Feb 6 15:16:38 2021 +0100
tdf#91920 sw page gutter margin, from top: add RTF export
The documentation for \gutterprl is "Parallel gutter.", but it seems
that's what Word use to convert between RTF and DOCX's .
Change-Id: I06d80f234c6f52950db8a047bfc88910b808977d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110484
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/include/svtools/rtfkeywd.hxx b/include/svtools/rtfkeywd.hxx
index 1f96630cb4f8..b02395e45a5d 100644
--- a/include/svtools/rtfkeywd.hxx
+++ b/include/svtools/rtfkeywd.hxx
@@ -1223,5 +1223,6 @@
#define LO_STRING_SVTOOLS_RTF_SBAUTO "\\sbauto"
#define LO_STRING_SVTOOLS_RTF_SAAUTO "\\saauto"
#define LO_STRING_SVTOOLS_RTF_HTMAUTSP "\\htmautsp"
+#define LO_STRING_SVTOOLS_RTF_GUTTERPRL "\\gutterprl"
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/qa/extras/rtfexport/data/gutter-top.rtf
b/sw/qa/extras/rtfexport/data/gutter-top.rtf
new file mode 100644
index ..9c9a78ce2d03
--- /dev/null
+++ b/sw/qa/extras/rtfexport/data/gutter-top.rtf
@@ -0,0 +1,4 @@
+{\rtf1
+\paperw12240\paperh15840\margl1440\margr1440\margt1440\margb1440\gutter720\gutterprl
+\pard\plain Half inch gutter on the top\par
+}
diff --git a/sw/qa/extras/rtfexport/rtfexport4.cxx
b/sw/qa/extras/rtfexport/rtfexport4.cxx
index 2bfdf0a13c87..669deb82f144 100644
--- a/sw/qa/extras/rtfexport/rtfexport4.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport4.cxx
@@ -400,6 +400,20 @@ CPPUNIT_TEST_FIXTURE(Test, testGutterLeft)
CPPUNIT_ASSERT_EQUAL(static_cast(1270), nGutterMargin);
}
+CPPUNIT_TEST_FIXTURE(Test, testGutterTop)
+{
+load(mpTestDocumentPath, "gutter-top.rtf");
+reload(mpFilter, "gutter-left.rtf");
+uno::Reference xFactory(mxComponent,
uno::UNO_QUERY);
+uno::Reference xSettings(
+xFactory->createInstance("com.sun.star.document.Settings"),
uno::UNO_QUERY);
+bool bGutterAtTop{};
+xSettings->getPropertyValue("GutterAtTop") >>= bGutterAtTop;
+// Without the accompanying fix in place, this test would have failed,
becase the gutter was
+// at the left.
+CPPUNIT_ASSERT(bGutterAtTop);
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/rtfexport.cxx
b/sw/source/filter/ww8/rtfexport.cxx
index 7f4ceb97dd5f..616f28ab0aa7 100644
--- a/sw/source/filter/ww8/rtfexport.cxx
+++ b/sw/source/filter/ww8/rtfexport.cxx
@@ -726,6 +726,13 @@ ErrCode RtfExport::ExportDocument_Impl()
// Mirror margins?
if ((UseOnPage::Mirror & m_rDoc.GetPageDesc(0).ReadUseOn()) ==
UseOnPage::Mirror)
Strm().WriteCharPtr(OOO_STRING_SVTOOLS_RTF_MARGMIRROR);
+
+// Gutter at top?
+if
(m_rDoc.getIDocumentSettingAccess().get(DocumentSettingId::GUTTER_AT_TOP))
+{
+Strm().WriteCharPtr(LO_STRING_SVTOOLS_RTF_GUTTERPRL);
+}
+
// Init sections
m_pSections = new MSWordSections(*this);
diff --git a/writerfilter/source/rtftok/rtfdispatchflag.cxx
b/writerfilter/source/rtftok/rtfdispatchflag.cxx
index 8797a08442d8..30f97530a56c 100644
--- a/writerfilter/source/rtftok/rtfdispatchflag.cxx
+++ b/writerfilter/source/rtftok/rtfdispatchflag.cxx
@@ -1224,6 +1224,9 @@ RTFError RTFDocumentImpl::dispatchFlag(RTFKeyword
nKeyword)
m_aSettingsTableSprms.set(NS_ooxml::LN_CT_Settings_longerSpaceSequence,
new RTFValue(0));
break;
+case RTF_GUTTERPRL:
+m_aSettingsTableSprms.set(NS_ooxml::LN_CT_Settings_gutterAtTop,
new RTFValue(1));
+break;
default:
{
SAL_INFO("writerfilter", "TODO handle flag '" <<
keywordToString(nKeyword) << "'");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: wizards/source
wizards/source/sfdocuments/SF_FormControl.xba | 37 +-
1 file changed, 31 insertions(+), 6 deletions(-)
New commits:
commit 1ea8e56ec3c15fb23bb8c0512c4e6afa8bc9d66e
Author: Jean-Pierre Ledure
AuthorDate: Fri Feb 5 17:34:02 2021 +0100
Commit: Jean-Pierre Ledure
CommitDate: Sat Feb 6 15:31:41 2021 +0100
ScriptForge - (SF_FormControl) add SetFocus() method
The SetFocus() method simply applies the setFocus() UNO method
for usual controls.
However controls belonging to a table control require,
to receive the focus, the columns to be scanned from left to right
up to the targeted column.
Change-Id: Idbb1ca4b4b29bff889daa83cfa895501c466bb26
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110485
Tested-by: Jean-Pierre Ledure
Reviewed-by: Jean-Pierre Ledure
diff --git a/wizards/source/sfdocuments/SF_FormControl.xba
b/wizards/source/sfdocuments/SF_FormControl.xba
index 3e4ad352c782..aebe9a1dd313 100644
--- a/wizards/source/sfdocuments/SF_FormControl.xba
+++ b/wizards/source/sfdocuments/SF_FormControl.xba
@@ -743,7 +743,7 @@ Finally:
Catch:
GoTo Finally
CatchNotFound:
- ScriptForge.SF_Utils._Validate(ControlName, "ControlName",
V_STRING, _Form.getElementNames())
+ ScriptForge.SF_Utils._Validate(ControlName, "ControlName",
V_STRING, _ControlModel.getElementNames())
GoTo Finally
End Function ' SFDocuments.SF_FormControl.Controls
@@ -859,13 +859,18 @@ Public Function SetFocus() As Boolean
''' Returns:
''' True if focusing is successful
''' Example:
-''' Dim oDlg As Object, oControl As Object
-''' Set oDlg = CreateScriptService(,,
"myControl")' Control stored in current document's
standard library
+''' Dim oDoc As Object, oForm As Object, oControl
As Object
+''' Set oDoc = Set oDoc =
CreateScriptService("SFDocuments.Document", ThisComponent)
+''' Set oForm = oDoc.Forms(0)
''' Set oControl =
oDlg.Controls("thisControl")
''' oControl.SetFocus()
Dim bSetFocus As Boolean ' Return value
-Const cstThisSub = "SFDocuments.DialogControl.SetFocus"
+Dim iColPosition As Integer' Position of control in table
+Dim oTableModel As Object ' XControlModel of parent tabel
+Dim oControl As Object ' com.sun.star.awt.XControlModel
+Dim i As Integer, j As Integer
+Const cstThisSub = "SFDocuments.FormControl.SetFocus"
Const cstSubArgs = ""
If ScriptForge.SF_Utils._ErrorHandling() Then On Local Error GoTo Catch
@@ -873,14 +878,34 @@ Const cstSubArgs = ""
Check:
If ScriptForge.SF_Utils._EnterFunction(cstThisSub, cstSubArgs) Then
- If Not [_Parent]._IsStillAlive() Then GoTo Finally
+ If Not _ParentForm._IsStillAlive() Then GoTo Finally
End If
Try:
If Not IsNull(_ControlView) Then
- _ControlView.setFocus()
+ If _ParentIsTable Then ' setFocus() method does not work
on controlviews in table control ?!?
+ ' Find the column position of the current
instance in the parent table control
+ iColPosition = -1
+ Set oTableModel = [_Parent]._ControlModel
+ j = -1
+ For i = 0 To oTableModel.Count - 1
+ Set oControl = oTableModel.getByIndex(i)
+ If Not oControl.Hidden Then j = j + 1
' Skip hidden columns
+ If oControl.Name = _Name Then
+ iColPosition = j
+ Exit For
+ End If
+ Next i
+ If iColPosition >= 0 Then
+ [_Parent]._ControlView.setFocus()
'Set first focus on table
control itself
+
[_Parent]._ControlView.setCurrentColumnPosition(iColPosition)
'Deprecated but no alternative found
+ End If
+ Else
+ _ControlView.setFocus()
+ End If
bSetFocus = True
End If
+ bSetFocus = True
Finally:
SetFocus = bSetFocus
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: scripting/source
scripting/source/stringresource/stringresource.hxx |6 +- 1 file changed, 1 insertion(+), 5 deletions(-) New commits: commit ab559cf3423f29f00697afb9cea4636e9f9069f6 Author: ViKrAm-Baisclear AuthorDate: Fri Jan 15 14:03:08 2021 +0530 Commit: Ilmari Lauhakangas CommitDate: Sat Feb 6 15:38:35 2021 +0100 tdf#124176 Used pragma once instead of include guards Change-Id: I235462f3ce81816f3ce36c7423dd3e50fc03778a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109320 Tested-by: Jenkins Reviewed-by: Ilmari Lauhakangas diff --git a/scripting/source/stringresource/stringresource.hxx b/scripting/source/stringresource/stringresource.hxx index 81c558fd7b99..6a2a583c3b3e 100644 --- a/scripting/source/stringresource/stringresource.hxx +++ b/scripting/source/stringresource/stringresource.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SCRIPTING_SOURCE_STRINGRESOURCE_STRINGRESOURCE_HXX -#define INCLUDED_SCRIPTING_SOURCE_STRINGRESOURCE_STRINGRESOURCE_HXX +#pragma once #include #include @@ -491,7 +490,4 @@ public: } // namespace stringtable - -#endif // INCLUDED_SCRIPTING_SOURCE_STRINGRESOURCE_STRINGRESOURCE_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/sbasic/shared/03/sf_dialog.xhp| 34 +- source/text/sbasic/shared/03/sf_dialogcontrol.xhp | 20 ++-- 2 files changed, 19 insertions(+), 35 deletions(-) New commits: commit e11819032b6926d774bcb529d629a6c6770fb60d Author: Alain Romedenne AuthorDate: Fri Feb 5 15:49:38 2021 +0100 Commit: Olivier Hallot CommitDate: Sat Feb 6 15:53:46 2021 +0100 Dialog/DialogControl layout updates + a few text precisions Change-Id: I700f78045843a9a8a6a47c6eb002fea8ff213c6e Reviewed-on: https://gerrit.libreoffice.org/c/help/+/110443 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/sbasic/shared/03/sf_dialog.xhp b/source/text/sbasic/shared/03/sf_dialog.xhp index ce5db1b14..5087ae61b 100644 --- a/source/text/sbasic/shared/03/sf_dialog.xhp +++ b/source/text/sbasic/shared/03/sf_dialog.xhp @@ -8,33 +8,27 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * --> - SFDialogs.Dialog service /text/sbasic/shared/03/sf_dialog.xhp - Dialog service - SFDialogs.Dialog service - The Dialog service contributes to the management of dialogs created with the Basic Dialog Editor. Each instance of the current class represents a single dialog box displayed to the user. - A dialog box can be displayed in modal or in non-modal modes. - In modal mode, the box is displayed and the execution of the macro process is suspended until one of the OK or Cancel buttons is pressed. In the meantime, other user actions executed on the box can trigger specific actions. + In modal mode, the box is displayed and the execution of the macro process is suspended until one of the OK or Cancel buttons is pressed. In the meantime, user actions executed on the box can trigger specific actions. In non-modal mode, the dialog box is "floating" on the user desktop and the execution of the macro process continues normally. Regardless of its status, the dialog closes when the macro that displayed it finishes running. A dialog box disappears from memory after its explicit termination. The SFDialogs.Dialog service is closely related to the SFDialogs.DialogControl service. - Service invocation and usage The dialog service is invoked through the CreateScriptService method. It requires three arguments to specify the dialog box to activate: Container: "GlobalScope" for preinstalled libraries or a window name as defined by ScriptForge.UI service. Empty string "" default value stands for the current document. @@ -52,7 +46,7 @@ End If oDlg.Terminate() - Alternatively a dialog instance can be retrieved via the dialog event manager, providing the dialog was initiated with the SFDialog.Dialog service. Events often require to identify the dialog class instance that triggered the event. + Alternatively a Dialog instance can be retrieved via the SFDialogs.DialogEvent service, providing the dialog was initiated with the Dialog service. DialogEvent returns the SFDialogs.Dialog service instance that triggered the event. Sub SomeEvent(ByRef poEvent As Object) Dim oDlg As Object @@ -62,7 +56,6 @@ End Sub Note that in previous examples, the prefix "SFDialogs." may be omitted. - Properties @@ -202,10 +195,10 @@ API;UnoControlDialogModel -com.sun.star.awt.XControlModelhttps://api.libreoffice.org/docs/idl/ref/servicecom_1_1sun_1_1star_1_1awt_1_1UnoControlDialogModel-members.html"; name="css.awt.UnoControlDialogModel">..awt.UnoControlDialogModel +UNOobject -The UNO object representing the dialog model. +The UNO object representing the dialog model. Refer to https://api.libreoffice.org/docs/idl/ref/interfacecom_1_1sun_1_1star_1_1awt_1_1XControlModel.html"; name="XControlModel interface">XControlModel and https://api.libreoffice.org/docs/idl/ref/servicecom_1_1sun_1_1star_1_1awt_1_1UnoControlDialogModel-members.html"; name="css.awt.UnoControlDialogModel">UnoControlDialogModel in Application Programming Interface (API) documentation for detailed information. @@ -219,14 +212,13 @@ API;UnoControlDialog -com.sun.star.awt.XControlhttps://api.libreoffice.org/docs/idl/ref/servicecom_1_1sun_1_1star_1_1awt_1_1UnoControlDialog-members.html"; name="UnoControlDialog interface">..awt.UnoControlDialog +UNOobject -The UNO object representing the dialog view. +The UNO object representing the dialog view. Refer to https://api.libreoffice.org/docs/idl/ref/interfacecom_1_1sun_1_1star_1_1awt_1_1XControlModel.html"; name="XControl interface">XControl and https://api.libreoffice.org/docs/idl/ref/servicecom_1_1sun_1_1star_1_1awt_1_1UnoControlDia
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ca074a47e8fdae396633dad6f59450508bb2c9f0 Author: Alain Romedenne AuthorDate: Sat Feb 6 15:53:46 2021 +0100 Commit: Gerrit Code Review CommitDate: Sat Feb 6 15:53:46 2021 +0100 Update git submodules * Update helpcontent2 from branch 'master' to e11819032b6926d774bcb529d629a6c6770fb60d - Dialog/DialogControl layout updates + a few text precisions Change-Id: I700f78045843a9a8a6a47c6eb002fea8ff213c6e Reviewed-on: https://gerrit.libreoffice.org/c/help/+/110443 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 4d729a974b43..e11819032b69 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 4d729a974b430318ea296148805a3bb02dfb95e5 +Subproject commit e11819032b6926d774bcb529d629a6c6770fb60d ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: chart2/source filter/source include/tools oox/source sd/source vbahelper/source vcl/unx
chart2/source/view/charttypes/VSeriesPlotter.cxx |4 -
chart2/source/view/main/ShapeFactory.cxx |3 -
chart2/source/view/main/VLegend.cxx |4 -
filter/source/msfilter/svdfppt.cxx| 12 ++--
include/tools/UnitConversion.hxx | 66 +-
oox/source/drawingml/chart/typegroupconverter.cxx |3 -
oox/source/ole/vbacontrol.cxx |4 -
sd/source/core/drawdoc4.cxx |4 -
sd/source/core/stlpool.cxx|3 -
sd/source/filter/eppt/epptso.cxx |3 -
sd/source/filter/eppt/pptx-epptooxml.cxx |5 +
sd/source/filter/eppt/pptx-text.cxx | 17 +++--
vbahelper/source/vbahelper/vbahelper.cxx | 23 ++-
vcl/unx/gtk3/a11y/gtk3atktextattributes.cxx |9 ---
14 files changed, 83 insertions(+), 77 deletions(-)
New commits:
commit 956c09ca7d690471f62e8e2e14ad04fefcebf7e7
Author: Mike Kaganski
AuthorDate: Fri Feb 5 19:35:14 2021 +0300
Commit: Mike Kaganski
CommitDate: Sat Feb 6 17:05:44 2021 +0100
Use more conversion functions from
This unifies conversion functions to provide both floating-point
and integral overloads, with correct rounding for the latter.
Also sanitizing code it templatized to allow reuse if needed.
Change-Id: Ibe1c9fe4d5baa226c600445779dbaf7dc41a02cb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110487
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx
b/chart2/source/view/charttypes/VSeriesPlotter.cxx
index f405396e113c..92cb3786d594 100644
--- a/chart2/source/view/charttypes/VSeriesPlotter.cxx
+++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx
@@ -61,6 +61,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -451,8 +452,7 @@ uno::Reference< drawing::XShape >
VSeriesPlotter::createDataLabel( const uno::Re
uno::Reference< beans::XPropertySet > xProps(
rDataSeries.getPropertiesOfPoint( nPointIndex ) );
if( xProps.is() )
xProps->getPropertyValue( "CharHeight") >>= fViewFontSize;
-// pt -> 1/100th mm
-fViewFontSize *= (2540.0f / 72.0f);
+fViewFontSize = convertPointToMm100(fViewFontSize);
}
// the font height is used for computing the size of an optional legend
diff --git a/chart2/source/view/main/ShapeFactory.cxx
b/chart2/source/view/main/ShapeFactory.cxx
index 22b9f8d07820..5b7c4859beb8 100644
--- a/chart2/source/view/main/ShapeFactory.cxx
+++ b/chart2/source/view/main/ShapeFactory.cxx
@@ -56,6 +56,7 @@
#include
#include
#include
+#include
#include
#include
@@ -2391,7 +2392,7 @@ uno::Reference< drawing::XShape >
float fFontHeight = 0.0;
if ( xShapeProp.is() && ( xShapeProp->getPropertyValue( "CharHeight" )
>>= fFontHeight ) )
{
-fFontHeight *= ( 2540.0f / 72.0f ); // pt -> 1/100 mm
+fFontHeight = convertPointToMm100(fFontHeight);
sal_Int32 nXDistance = static_cast< sal_Int32 >(
::rtl::math::round( fFontHeight * 0.18f ) );
sal_Int32 nYDistance = static_cast< sal_Int32 >(
::rtl::math::round( fFontHeight * 0.30f ) );
xShapeProp->setPropertyValue( "TextLeftDistance", uno::Any(
nXDistance ) );
diff --git a/chart2/source/view/main/VLegend.cxx
b/chart2/source/view/main/VLegend.cxx
index 77e6b5800dc5..e05aa94db702 100644
--- a/chart2/source/view/main/VLegend.cxx
+++ b/chart2/source/view/main/VLegend.cxx
@@ -42,6 +42,7 @@
#include
#include
#include
+#include
#include
#include
@@ -85,8 +86,7 @@ double lcl_CalcViewFontSize(
}
}
-// pt -> 1/100th mm
-return (fResult * (2540.0 / 72.0));
+return convertPointToMm100(fResult);
}
void lcl_getProperties(
diff --git a/filter/source/msfilter/svdfppt.cxx
b/filter/source/msfilter/svdfppt.cxx
index 1d7a36032d4c..8cfbf6ed3922 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -3800,8 +3800,8 @@ void PPTNumberFormatCreator::ImplGetNumberFormat(
SdrPowerPointImport const & rM
rNumberFormat.SetBulletChar( nBuChar );
rNumberFormat.SetBulletRelSize( static_cast(nBulletHeight) );
rNumberFormat.SetBulletColor( aCol );
-sal_uInt32 nAbsLSpace = ( nTextOfs * 2540 ) / 576;
-sal_uInt32 nFirstLineOffset = nAbsLSpace - ( nBulletOfs * 2540 ) / 576;
+sal_uInt32 nAbsLSpace = convertMasterUnitToMm100(nTextOfs);
+sal_uInt32 nFirstLineOffset = nAbsLSpace -
convertMasterUnitToMm100(nBulletOfs);
rNumberFormat.SetAbsLSpace( nAbsLSpace );
rNumberFormat.SetFirstLineOffset(
-static_cast(nFirstLineOffset) );
}
@@ -6211,8 +6211,8 @@ void PPTParagraphObj::ApplyTo( SfxItemSet& rSet,
std::optional< sal_Int16 >& rS
if ( !nIsBullet2 )
{
SvxLRSpaceItem aLRSpaceItem( EE_PARA_LRSPAC
[Libreoffice-commits] core.git: starmath/inc starmath/source
starmath/inc/error.hxx| 56 -
starmath/inc/parse.hxx| 46 +--
starmath/inc/strings.hrc |1
starmath/source/parse.cxx | 78 ++
4 files changed, 83 insertions(+), 98 deletions(-)
New commits:
commit 7c959884d9a4a3f187a79cbb01407cd20d92a2f8
Author: dante
AuthorDate: Sat Feb 6 11:19:36 2021 +0100
Commit: Noel Grandin
CommitDate: Sat Feb 6 18:39:31 2021 +0100
Modifications on starmath smparse error handle
Made modifications for:
- Being able to highlight syntax errors
- Displaying error description in visual editor
- Easier constructor
- Rely on starmathdatabase instead of long switch in code.
Change-Id: Ic6c7f920463090176d80668f9b660ccf3e9b5708
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110497
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/starmath/inc/error.hxx b/starmath/inc/error.hxx
deleted file mode 100644
index dc798f6906e3..
--- a/starmath/inc/error.hxx
+++ /dev/null
@@ -1,56 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * 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 .
- */
-#ifndef INCLUDED_STARMATH_INC_ERROR_HXX
-#define INCLUDED_STARMATH_INC_ERROR_HXX
-
-#include
-
-class SmNode;
-
-// Those are the errors that the parser (parser.hxx/parser.cxx) may encounter.
-enum class SmParseError
-{
-None,
-UnexpectedChar,
-UnexpectedToken,
-PoundExpected,
-ColorExpected,
-LgroupExpected,
-RgroupExpected,
-LbraceExpected,
-RbraceExpected,
-ParentMismatch,
-RightExpected,
-FontExpected,
-SizeExpected,
-DoubleAlign,
-DoubleSubsupscript,
-NumberExpected
-};
-
-struct SmErrorDesc
-{
-SmParseError m_eType;
-SmNode* m_pNode;
-OUString m_aText;
-};
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/starmath/inc/parse.hxx b/starmath/inc/parse.hxx
index b010db941832..6eb83500b3d3 100644
--- a/starmath/inc/parse.hxx
+++ b/starmath/inc/parse.hxx
@@ -30,7 +30,6 @@
#include
#include "token.hxx"
-#include "error.hxx"
class SmBlankNode;
class SmBinVerNode;
@@ -46,6 +45,50 @@ class SmTextNode;
#define DEPTH_LIMIT 1024
+// Those are the errors that the parser may encounter.
+enum class SmParseError : uint_fast8_t
+{
+None = 0,
+UnexpectedChar = 1,
+UnexpectedToken = 2,
+PoundExpected = 3,
+ColorExpected = 4,
+LgroupExpected = 5,
+RgroupExpected = 6,
+LbraceExpected = 7,
+RbraceExpected = 8,
+ParentMismatch = 9,
+RightExpected = 10,
+FontExpected = 11,
+SizeExpected = 12,
+DoubleAlign = 13,
+DoubleSubsupscript = 14,
+NumberExpected = 15
+};
+
+struct SmErrorDesc
+{
+SmParseError m_eType;
+SmNode* m_pNode;
+OUString m_aText;
+
+SmErrorDesc(SmParseError eType, SmNode* pNode, OUString aText)
+: m_eType(eType)
+, m_pNode(pNode)
+, m_aText(aText)
+{}
+
+};
+
+namespace starmathdatabase{
+
+// Must be in sync with SmParseError list
+extern const char* SmParseErrorDesc[16];
+
+OUString getParseErrorDesc(SmParseError err);
+
+}
+
class SmParser
{
OUStringm_aBufferString;
@@ -148,7 +191,6 @@ public:
boolIsExportSymbolNames() const{ return m_bExportSymNames;
}
voidSetExportSymbolNames(bool bVal){ m_bExportSymNames = bVal;
}
-voidAddError(SmParseError Type, SmNode *pNode);
const SmErrorDesc* NextError();
const SmErrorDesc* PrevError();
const SmErrorDesc* GetError();
diff --git a/starmath/inc/strings.hrc b/starmath/inc/strings.hrc
index 01dc7b864ee4..daa90f02545d 100644
--- a/starmath/inc/strings.hrc
+++ b/starmath/inc/strings.hrc
@@ -374,6 +374,7 @@
#define STR_STATSTR_WRITING NC_("STR_STATSTR_WRITING", "Saving
document..." )
#define STR_MATH_DOCUMENT_FULLTYPE_CURRENT
NC_("STR_MATH_DOCUMENT_FULLTYPE_CURRENT", "%PRODUCTNAME %PRODUCTVERSION
Formula")
#define RID_ERR_IDENT NC_("RID_ERR_IDENT", "ERROR : " )
+#define RID_ERR_NONENC_("RID_ERR_NONE", "no error
[Libreoffice-commits] core.git: sw/qa
sw/qa/extras/uiwriter/uiwriter3.cxx | 29 +
1 file changed, 29 insertions(+)
New commits:
commit 51ecbd06bdef5d9c0738703f16160799f261c860
Author: Xisco Fauli
AuthorDate: Sat Feb 6 18:32:36 2021 +0100
Commit: Xisco Fauli
CommitDate: Sat Feb 6 19:38:44 2021 +0100
tdf#135014: sw_uiwriter3: Add unittest
Change-Id: I6baf00837de37604a872bb1a125010a7a6f06e89
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110511
Tested-by: Jenkins
Reviewed-by: Xisco Fauli
diff --git a/sw/qa/extras/uiwriter/uiwriter3.cxx
b/sw/qa/extras/uiwriter/uiwriter3.cxx
index 87f2cc338038..b755378b0b72 100644
--- a/sw/qa/extras/uiwriter/uiwriter3.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter3.cxx
@@ -1585,6 +1585,35 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf132744)
CPPUNIT_ASSERT_EQUAL(1, getShapes());
}
+CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf135014)
+{
+mxComponent = loadFromDesktop("private:factory/swriter",
"com.sun.star.text.TextDocument");
+
+SwXTextDocument* pTextDoc =
dynamic_cast(mxComponent.get());
+CPPUNIT_ASSERT(pTextDoc);
+
+uno::Sequence aArgs(
+comphelper::InitPropertySequence({ { "KeyModifier",
uno::makeAny(sal_Int32(0)) } }));
+
+// Toggle Numbering List
+dispatchCommand(mxComponent, ".uno:DefaultBullet", aArgs);
+Scheduler::ProcessEventsToIdle();
+
+uno::Sequence
aArgs2(comphelper::InitPropertySequence(
+{ { "Param", uno::makeAny(OUString("NewNumberingStyle")) },
+ { "Family",
uno::makeAny(static_cast(SfxStyleFamily::Pseudo)) } }));
+
+// New Style from selection
+dispatchCommand(mxComponent, ".uno:StyleNewByExample", aArgs2);
+Scheduler::ProcessEventsToIdle();
+
+// Without the fix in place, this test would have failed here
+reload("Office Open XML Text", "tdf135014.docx");
+
+xmlDocUniquePtr pXmlStyles = parseExport("word/styles.xml");
+assertXPath(pXmlStyles,
"/w:styles/w:style[@w:styleId='NewNumberingStyle']/w:qFormat", 1);
+}
+
CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf133358)
{
mxComponent = loadFromDesktop("private:factory/swriter",
"com.sun.star.text.TextDocument");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: filter/source
filter/source/graphicfilter/ipict/ipict.cxx |6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
New commits:
commit a838ccb411dfe7ff6edf9503ae23ea655b99e1e6
Author: Caolán McNamara
AuthorDate: Fri Feb 5 21:02:52 2021 +
Commit: Caolán McNamara
CommitDate: Sat Feb 6 20:20:35 2021 +0100
ofz#30117 OOM
Change-Id: Iaa428f28ba36b21766d9cf2f7c622a179daf0002
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110492
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/filter/source/graphicfilter/ipict/ipict.cxx
b/filter/source/graphicfilter/ipict/ipict.cxx
index 43b872f09558..16b5c3f6be6e 100644
--- a/filter/source/graphicfilter/ipict/ipict.cxx
+++ b/filter/source/graphicfilter/ipict/ipict.cxx
@@ -1966,7 +1966,11 @@ void PictReader::ReadPict( SvStream & rStreamPict,
GDIMetaFile & rGDIMetaFile )
else
nPos+=1+nSize;
-pPict->Seek(nPos);
+if (!checkSeek(*pPict, nPos))
+{
+pPict->SetError(SVSTREAM_FILEFORMAT_ERROR);
+break;
+}
}
pVirDev->SetClipRegion();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: dbaccess/source sw/source
dbaccess/source/ui/inc/TableWindowTitle.hxx |1 - sw/source/uibase/docvw/AnnotationWin.cxx|4 sw/source/uibase/docvw/AnnotationWin2.cxx |2 -- 3 files changed, 7 deletions(-) New commits: commit d76b9cc0e96e06777c683ba172e04454c8893c84 Author: Caolán McNamara AuthorDate: Fri Feb 5 16:24:26 2021 + Commit: Caolán McNamara CommitDate: Sat Feb 6 20:23:09 2021 +0100 drop some unneeded includes Change-Id: I3cd72110ae2601b1b11539702c5fb91086d779eb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110486 Tested-by: Jenkins Reviewed-by: Caolán McNamara diff --git a/dbaccess/source/ui/inc/TableWindowTitle.hxx b/dbaccess/source/ui/inc/TableWindowTitle.hxx index 2fe9c30c5091..d60f7389a4f8 100644 --- a/dbaccess/source/ui/inc/TableWindowTitle.hxx +++ b/dbaccess/source/ui/inc/TableWindowTitle.hxx @@ -29,7 +29,6 @@ namespace dbaui protected: virtual void Command(const CommandEvent& rEvt) override; -// virtual void Paint( const Rectangle& rRect ); virtual void MouseButtonDown( const MouseEvent& rEvt ) override; virtual void KeyInput( const KeyEvent& rEvt ) override; virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; diff --git a/sw/source/uibase/docvw/AnnotationWin.cxx b/sw/source/uibase/docvw/AnnotationWin.cxx index 34edc64425f5..084aa066bf03 100644 --- a/sw/source/uibase/docvw/AnnotationWin.cxx +++ b/sw/source/uibase/docvw/AnnotationWin.cxx @@ -25,10 +25,6 @@ #include -#include -#include -#include -#include #include #include #include diff --git a/sw/source/uibase/docvw/AnnotationWin2.cxx b/sw/source/uibase/docvw/AnnotationWin2.cxx index 36f179869e45..f0f9235a1566 100644 --- a/sw/source/uibase/docvw/AnnotationWin2.cxx +++ b/sw/source/uibase/docvw/AnnotationWin2.cxx @@ -51,9 +51,7 @@ #include #include -#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: starmath/inc starmath/source
starmath/inc/node.hxx |3 -
starmath/inc/token.hxx | 14 ++--
starmath/source/cursor.cxx | 18 +++---
starmath/source/mathml/mathmlimport.cxx | 68 +++
starmath/source/node.cxx|8 +-
starmath/source/ooxmlexport.cxx |3 -
starmath/source/parse.cxx | 94
starmath/source/visitors.cxx|2
8 files changed, 105 insertions(+), 105 deletions(-)
New commits:
commit 96e9870b3204eabc6bca1c92f714f80592a54102
Author: dante
AuthorDate: Fri Feb 5 16:27:40 2021 +0100
Commit: Caolán McNamara
CommitDate: Sat Feb 6 20:53:22 2021 +0100
Use multichar operators
There are no functional changes, only type change.
This patch unlocks other possibilities like:
- Syntax highlight for errors
- Visual editor for structure nodes
- Implement some mathml features
Change-Id: I76a1b62126ae5fcb6a7285b07b24e9defa63fd44
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110481
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/starmath/inc/node.hxx b/starmath/inc/node.hxx
index 3c267bb4a9ad..61f98ec75d87 100644
--- a/starmath/inc/node.hxx
+++ b/starmath/inc/node.hxx
@@ -972,8 +972,7 @@ protected:
SmMathSymbolNode(SmNodeType eNodeType, const SmToken &rNodeToken)
: SmSpecialNode(eNodeType, rNodeToken, FNT_MATH)
{
-sal_Unicode cChar = GetToken().cMathChar;
-if (u'\0' != cChar) SetText(OUString(cChar));
+SetText(GetToken().cMathChar);
}
public:
diff --git a/starmath/inc/token.hxx b/starmath/inc/token.hxx
index 600c29b9f889..5b903cc7bc1c 100644
--- a/starmath/inc/token.hxx
+++ b/starmath/inc/token.hxx
@@ -211,7 +211,7 @@ struct SmToken
{
OUString aText; // token text
SmTokenType eType; // token info
-sal_Unicode cMathChar;
+OUString cMathChar;
// parse-help info
TG nGroup;
@@ -247,7 +247,7 @@ struct SmToken
{
aText = aTokenTableEntry.pIdent;
eType = aTokenTableEntry.eType;
-cMathChar = aTokenTableEntry.cMathChar;
+cMathChar = OUString(&aTokenTableEntry.cMathChar, 1);
nGroup = aTokenTableEntry.nGroup;
nLevel = aTokenTableEntry.nLevel;
nRow = 0;
@@ -258,7 +258,7 @@ struct SmToken
{
aText = aTokenTableEntry->pIdent;
eType = aTokenTableEntry->eType;
-cMathChar = aTokenTableEntry->cMathChar;
+cMathChar = OUString(&aTokenTableEntry->cMathChar, 1);
nGroup = aTokenTableEntry->nGroup;
nLevel = aTokenTableEntry->nLevel;
nRow = 0;
@@ -269,7 +269,7 @@ struct SmToken
{
aText =
OUString::number(static_cast(aTokenTableEntry.cColor), 16);
eType = aTokenTableEntry.eType;
-cMathChar = MS_NULLCHAR;
+cMathChar = u"";
nGroup = TG::Color;
nLevel = 0;
nRow = 0;
@@ -280,7 +280,7 @@ struct SmToken
{
aText =
OUString::number(static_cast(aTokenTableEntry->cColor), 16);
eType = aTokenTableEntry->eType;
-cMathChar = MS_NULLCHAR;
+cMathChar = u"";
nGroup = TG::Color;
nLevel = 0;
nRow = 0;
@@ -291,12 +291,14 @@ struct SmToken
{
aText =
OUString::number(static_cast(aTokenTableEntry->cColor), 16);
eType = aTokenTableEntry->eType;
-cMathChar = MS_NULLCHAR;
+cMathChar = u"";
nGroup = TG::Color;
nLevel = 0;
nRow = 0;
nCol = 0;
}
+
+void setChar(sal_Unicode cChar) { cMathChar = OUString(&cChar, 1); }
};
#endif
diff --git a/starmath/source/cursor.cxx b/starmath/source/cursor.cxx
index cdac53d4a234..a7d5ba76c542 100644
--- a/starmath/source/cursor.cxx
+++ b/starmath/source/cursor.cxx
@@ -864,7 +864,7 @@ void SmCursor::InsertText(const OUString& aString)
SmToken token;
token.eType = TIDENT;
-token.cMathChar = '\0';
+token.cMathChar = u"";
token.nGroup = TG::NONE;
token.nLevel = 5;
token.aText = aString;
@@ -908,7 +908,7 @@ void SmCursor::InsertElement(SmFormulaElement element){
{
SmToken token;
token.eType = TPLUS;
-token.cMathChar = MS_PLUS;
+token.setChar(MS_PLUS);
token.nGroup = TG::UnOper | TG::Sum;
token.nLevel = 5;
token.aText = "+";
@@ -918,7 +918,7 @@ void SmCursor::InsertElement(SmFormulaElement element){
{
SmToken token;
token.eType = TMINUS;
-token.cMathChar = MS_MINUS;
+token.setChar(MS_MINUS);
token.nGroup = TG::UnOper | TG::Sum;
token.nLevel = 5;
token.aText = "-";
@@ -928,7 +928,7 @@ void SmCursor::InsertElement(SmFormulaElement element){
{
SmToken token;
token.eType = TCDOT;
-token.cMathChar = MS_CDOT;
+token.s
[Libreoffice-commits] core.git: sw/source
sw/source/core/txtnode/SwGrammarContact.cxx | 89 ++--
1 file changed, 46 insertions(+), 43 deletions(-)
New commits:
commit dcae40491eea2534c30ba96f10bc45035d073a46
Author: Bjoern Michaelsen
AuthorDate: Sat Feb 6 00:54:46 2021 +0100
Commit: Bjoern Michaelsen
CommitDate: Sat Feb 6 21:27:58 2021 +0100
replace SwClient by SvtListener in SwGrammarContact
Change-Id: I9bc31ac6a3990418c11a2f40ec0cc84f79f93d53
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110495
Tested-by: Jenkins
Reviewed-by: Bjoern Michaelsen
diff --git a/sw/source/core/txtnode/SwGrammarContact.cxx
b/sw/source/core/txtnode/SwGrammarContact.cxx
index 7b061bdaf9ba..e296cc7375e6 100644
--- a/sw/source/core/txtnode/SwGrammarContact.cxx
+++ b/sw/source/core/txtnode/SwGrammarContact.cxx
@@ -23,6 +23,7 @@
#include
#include
#include
+#include
namespace {
@@ -37,34 +38,32 @@ namespace {
* will replace the old list. If the grammar checker has completed the
paragraph ('setChecked')
* then a timer is setup which replaces the old list as well.
*/
-class SwGrammarContact : public IGrammarContact, public SwClient
+class SwGrammarContact : public IGrammarContact, public SvtListener
{
-Timer aTimer;
-std::unique_ptr mpProxyList;
-bool mbFinished;
-SwTextNode* getMyTextNode() { return
static_cast(GetRegisteredIn()); }
- DECL_LINK( TimerRepaint, Timer *, void );
+Timer m_aTimer;
+std::unique_ptr m_pProxyList;
+bool m_isFinished;
+SwTextNode* m_pTextNode;
+DECL_LINK( TimerRepaint, Timer *, void );
public:
SwGrammarContact();
-virtual ~SwGrammarContact() override { aTimer.Stop(); }
+virtual ~SwGrammarContact() override { m_aTimer.Stop(); }
// (pure) virtual functions of IGrammarContact
virtual void updateCursorPosition( const SwPosition& rNewPos ) override;
virtual SwGrammarMarkUp* getGrammarCheck( SwTextNode& rTextNode, bool
bCreate ) override;
virtual void finishGrammarCheck( SwTextNode& rTextNode ) override;
-protected:
-// virtual function of SwClient
-virtual void SwClientNotify( const SwModify&, const SfxHint& rHint)
override;
+virtual void Notify( const SfxHint& rHint) override;
};
}
-SwGrammarContact::SwGrammarContact() : mbFinished( false )
+SwGrammarContact::SwGrammarContact() : m_isFinished( false ),
m_pTextNode(nullptr)
{
-aTimer.SetTimeout( 2000 ); // Repaint of grammar check after 'setChecked'
-aTimer.SetInvokeHandler( LINK(this, SwGrammarContact, TimerRepaint) );
-aTimer.SetDebugName( "sw::SwGrammarContact TimerRepaint" );
+m_aTimer.SetTimeout( 2000 ); // Repaint of grammar check after
'setChecked'
+m_aTimer.SetInvokeHandler( LINK(this, SwGrammarContact, TimerRepaint) );
+m_aTimer.SetDebugName( "sw::SwGrammarContact TimerRepaint" );
}
IMPL_LINK( SwGrammarContact, TimerRepaint, Timer *, pTimer, void )
@@ -72,10 +71,10 @@ IMPL_LINK( SwGrammarContact, TimerRepaint, Timer *, pTimer,
void )
if( pTimer )
{
pTimer->Stop();
-if( GetRegisteredIn() )
+if( m_pTextNode )
{ //Replace the old wrong list by the proxy list and repaint all
frames
-getMyTextNode()->SetGrammarCheck( mpProxyList.release() );
-SwTextFrame::repaintTextFrames( *getMyTextNode() );
+m_pTextNode->SetGrammarCheck( m_pProxyList.release() );
+SwTextFrame::repaintTextFrames( *m_pTextNode );
}
}
}
@@ -84,48 +83,51 @@ IMPL_LINK( SwGrammarContact, TimerRepaint, Timer *, pTimer,
void )
void SwGrammarContact::updateCursorPosition( const SwPosition& rNewPos )
{
SwTextNode* pTextNode = rNewPos.nNode.GetNode().GetTextNode();
-if( pTextNode == GetRegisteredIn() ) // paragraph has been changed
+if( pTextNode == m_pTextNode ) // paragraph has been changed
return;
-aTimer.Stop();
-if( GetRegisteredIn() ) // My last paragraph has been left
+m_aTimer.Stop();
+if( m_pTextNode ) // My last paragraph has been left
{
-if( mpProxyList )
+if( m_pProxyList )
{ // replace old list by the proxy list and repaint
-getMyTextNode()->SetGrammarCheck( mpProxyList.release() );
-SwTextFrame::repaintTextFrames( *getMyTextNode() );
+m_pTextNode->SetGrammarCheck( m_pProxyList.release() );
+SwTextFrame::repaintTextFrames( *m_pTextNode );
}
EndListeningAll();
}
if( pTextNode )
-pTextNode->Add( this ); // welcome new paragraph
+{
+m_pTextNode = pTextNode;
+StartListening(pTextNode->GetNotifier()); // welcome new paragraph
+}
}
/* deliver a grammar check list for the given text node */
SwGrammarMarkUp* SwGrammarContact::getGrammarCheck( SwTextNode& rTextNode,
bool bCreate )
{
SwGrammarMarkUp *pRet = nullptr;
-if( GetRegisteredIn() == &rTextNode ) // hey, that's my current paragraph!
+if( m_pTextNode ==
[Libreoffice-commits] core.git: sw/source
sw/source/core/unocore/unomap.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit 9933c3631b5bd9d7b47d0d12c5a7dd292cf1944f
Author: Maxim Monastirsky
AuthorDate: Mon Feb 1 16:14:44 2021 +0200
Commit: Maxim Monastirsky
CommitDate: Sat Feb 6 22:39:13 2021 +0100
tdf#139529 Fix incomplete DisplayName property for table styles
Commit 4dc823990ab217cb9d07a0555d3015d43380fdf5 ("tdf#107852
Support DisplayName property for table styles") only handled
the getPropertyValue method, which isn't enough to make it
work with introspection, as used from Basic or the new dev
docking panel.
Change-Id: Ia4d90ab6030585dc469c0b274bef4b988ce647c1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110468
Tested-by: Jenkins
Reviewed-by: Maxim Monastirsky
diff --git a/sw/source/core/unocore/unomap.cxx
b/sw/source/core/unocore/unomap.cxx
index abcb313351d0..ff415b7ab658 100644
--- a/sw/source/core/unocore/unomap.cxx
+++ b/sw/source/core/unocore/unomap.cxx
@@ -1491,6 +1491,7 @@ const SfxItemPropertyMapEntry*
SwUnoPropertyMapProvider::GetPropertyMapEntries(s
{ u"" UNO_NAME_TABLE_FIRST_ROW_START_COLUMN, 0,
cppu::UnoType::get(), PROPERTY_NONE, 0 },
{ u"" UNO_NAME_TABLE_LAST_ROW_END_COLUMN,0,
cppu::UnoType::get(), PROPERTY_NONE, 0 },
{ u"" UNO_NAME_TABLE_LAST_ROW_START_COLUMN, 0,
cppu::UnoType::get(), PROPERTY_NONE, 0 },
+{ u"" UNO_NAME_DISPLAY_NAME, 0,
cppu::UnoType::get(), PropertyAttribute::READONLY, 0 },
{ u"", 0, css::uno::Type(), 0, 0 }
};
m_aMapEntriesArr[nPropertyId] = aTableStyleMap;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa wizards/source
sw/qa/extras/rtfexport/rtfexport4.cxx |2 +-
sw/qa/extras/ww8export/ww8export3.cxx |2 +-
wizards/source/sfdocuments/SF_FormControl.xba |4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit f72e347f6d8f26c6961d9d4f17a798f3b3276280
Author: Andrea Gelmini
AuthorDate: Sat Feb 6 22:16:08 2021 +0100
Commit: Andrea Gelmini
CommitDate: Sun Feb 7 08:42:14 2021 +0100
Fix typos
Change-Id: I30743ea4caf9702f26005567d293f076ff7f78fd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110517
Tested-by: Jenkins
Reviewed-by: Andrea Gelmini
diff --git a/sw/qa/extras/rtfexport/rtfexport4.cxx
b/sw/qa/extras/rtfexport/rtfexport4.cxx
index 669deb82f144..7cb2f5cdb5ff 100644
--- a/sw/qa/extras/rtfexport/rtfexport4.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport4.cxx
@@ -409,7 +409,7 @@ CPPUNIT_TEST_FIXTURE(Test, testGutterTop)
xFactory->createInstance("com.sun.star.document.Settings"),
uno::UNO_QUERY);
bool bGutterAtTop{};
xSettings->getPropertyValue("GutterAtTop") >>= bGutterAtTop;
-// Without the accompanying fix in place, this test would have failed,
becase the gutter was
+// Without the accompanying fix in place, this test would have failed,
because the gutter was
// at the left.
CPPUNIT_ASSERT(bGutterAtTop);
}
diff --git a/sw/qa/extras/ww8export/ww8export3.cxx
b/sw/qa/extras/ww8export/ww8export3.cxx
index a4e4c552a93a..00ab36ac67a2 100644
--- a/sw/qa/extras/ww8export/ww8export3.cxx
+++ b/sw/qa/extras/ww8export/ww8export3.cxx
@@ -115,7 +115,7 @@ CPPUNIT_TEST_FIXTURE(Test, testGutterTop)
xFactory->createInstance("com.sun.star.document.Settings"),
uno::UNO_QUERY);
bool bGutterAtTop{};
xSettings->getPropertyValue("GutterAtTop") >>= bGutterAtTop;
-// Without the accompanying fix in place, this test would have failed,
becase the gutter was
+// Without the accompanying fix in place, this test would have failed,
because the gutter was
// at the left.
CPPUNIT_ASSERT(bGutterAtTop);
}
diff --git a/wizards/source/sfdocuments/SF_FormControl.xba
b/wizards/source/sfdocuments/SF_FormControl.xba
index aebe9a1dd313..7fbd49bba965 100644
--- a/wizards/source/sfdocuments/SF_FormControl.xba
+++ b/wizards/source/sfdocuments/SF_FormControl.xba
@@ -867,7 +867,7 @@ Public Function SetFocus() As Boolean
Dim bSetFocus As Boolean ' Return value
Dim iColPosition As Integer' Position of control in table
-Dim oTableModel As Object ' XControlModel of parent tabel
+Dim oTableModel As Object ' XControlModel of parent table
Dim oControl As Object ' com.sun.star.awt.XControlModel
Dim i As Integer, j As Integer
Const cstThisSub = "SFDocuments.FormControl.SetFocus"
@@ -1846,4 +1846,4 @@ Private Function _Repr() As String
End Function ' SFDocuments.SF_FormControl._Repr
REM END OF
SFDOCUMENTS.SF_FORMCONTROL
-
\ No newline at end of file
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
