[Libreoffice-commits] core.git: cui/source
cui/source/tabpages/border.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 5b5ba7f407637023cfe50267296312bf5e8cf538
Author: Kiyotaka Nishibori
AuthorDate: Mon Jan 3 06:37:39 2022 +0900
Commit: Caolán McNamara
CommitDate: Tue Jan 4 11:35:38 2022 +0100
changed CuiResId into SvxResId.
though some translation entries for tooltip for border preset images were in
svx.mo, cui/source/tabpages/border.cxx referred the entries to cui.mo with
CuiResId route, and the translations was not gotten.
this commit is alternative change.
Change-Id: Ica7a7ea71f7afe7044104b9d953f1b3edf9c2503
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127852
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index 1f4ee798f7de..a3bd26d371b1 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -37,6 +37,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -1374,7 +1375,7 @@ void SvxBorderTabPage::FillPresetVS()
{
m_xWndPresets->InsertItem( nVSIdx );
m_xWndPresets->SetItemImage(nVSIdx,
m_aBorderImgVec[GetPresetImageId(nVSIdx) - 1]);
-m_xWndPresets->SetItemText( nVSIdx, CuiResId( GetPresetStringId(
nVSIdx ) ) );
+m_xWndPresets->SetItemText( nVSIdx, SvxResId( GetPresetStringId(
nVSIdx ) ) );
}
// show the control
[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - cui/source
cui/source/tabpages/border.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit ddfd6e7b93b906f16149608bfe86e859a28226bd
Author: Kiyotaka Nishibori
AuthorDate: Mon Jan 3 06:37:39 2022 +0900
Commit: Caolán McNamara
CommitDate: Mon Jan 3 16:21:17 2022 +0100
changed CuiResId into SvxResId.
though some translation entries for tooltip for border preset images were in
svx.mo, cui/source/tabpages/border.cxx referred the entries to cui.mo with
CuiResId route, and the translations was not gotten.
this commit is alternative change.
Change-Id: Ica7a7ea71f7afe7044104b9d953f1b3edf9c2503
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127771
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index 64558279be60..2964a5535c64 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -37,6 +37,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -1374,7 +1375,7 @@ void SvxBorderTabPage::FillPresetVS()
{
m_xWndPresets->InsertItem( nVSIdx );
m_xWndPresets->SetItemImage(nVSIdx,
m_aBorderImgVec[GetPresetImageId(nVSIdx) - 1]);
-m_xWndPresets->SetItemText( nVSIdx, CuiResId( GetPresetStringId(
nVSIdx ) ) );
+m_xWndPresets->SetItemText( nVSIdx, SvxResId( GetPresetStringId(
nVSIdx ) ) );
}
// show the control
[Libreoffice-commits] core.git: cui/uiconfig
cui/uiconfig/ui/areatabpage.ui |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit d710b7c8432d868f7c3f0bad30f2f13d4d504ec5 Author: Kiyotaka Nishibori AuthorDate: Sun Jan 17 10:58:27 2021 +0900 Commit: Heiko Tietze CommitDate: Mon Jan 18 08:23:16 2021 +0100 tdf#139691: fixed wrong extend-tips in areatabpage.ui. Change-Id: Ic99ef0a543098cd469db30474d1f8fcd466f2a2e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109461 Tested-by: Jenkins Reviewed-by: Heiko Tietze diff --git a/cui/uiconfig/ui/areatabpage.ui b/cui/uiconfig/ui/areatabpage.ui index 04e8243d6df5..9296a5b6cf6f 100644 --- a/cui/uiconfig/ui/areatabpage.ui +++ b/cui/uiconfig/ui/areatabpage.ui @@ -72,7 +72,7 @@ True -Fills the object with a gradient selected on this page. +Fills the object with a color selected on this page. @@ -108,7 +108,7 @@ True -Fills the object with a hatching pattern selected on this page. +Fills the object with a bitmap image selected on this page. @@ -126,7 +126,7 @@ True -Fills the object with a hatching pattern selected on this page. +Fills the object with a dot pattern selected on this page. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/uiconfig
cui/uiconfig/ui/bulletandposition.ui |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d45bf5e20e5abc2dcf5ea3d3be06aa61d92c762e Author: Kiyotaka Nishibori AuthorDate: Sun May 26 20:42:40 2019 +0900 Commit: Caolán McNamara CommitDate: Mon May 27 09:56:55 2019 +0200 fixed domain in bulletandposition.ui translatable strings in this .ui file are extracted as parts of cui/messages.pot. if the domain was "sd", only source strings would be shown. Change-Id: I1272721fbac72c0b5e392d65e080dd31a5bbc709 Reviewed-on: https://gerrit.libreoffice.org/72973 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/cui/uiconfig/ui/bulletandposition.ui b/cui/uiconfig/ui/bulletandposition.ui index 0dbbe04a583b..393c3fb4d841 100644 --- a/cui/uiconfig/ui/bulletandposition.ui +++ b/cui/uiconfig/ui/bulletandposition.ui @@ -1,6 +1,6 @@ - + 19.988 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - cui/source desktop/source sc/uiconfig svx/source
cui/source/tabpages/transfrm.cxx| 47 --
desktop/source/lib/init.cxx | 32 +
sc/uiconfig/scalc/ui/condformatmanager.ui |4 -
svx/source/sidebar/possize/PosSizePropertyPanel.cxx | 65 +---
svx/source/svdraw/svdedtv1.cxx | 38 +--
5 files changed, 45 insertions(+), 141 deletions(-)
New commits:
commit 2141f6d44a4f72396d9ab8effe8d1619a25dca8b
Author: Kiyotaka Nishibori
AuthorDate: Sun May 19 11:05:07 2019 +0900
Commit: Katarina Behrens
CommitDate: Mon May 20 10:31:09 2019 +0200
swapped column titles in condformatmanager.ui to fit the contents.
Change-Id: Ia4c9a32e91b5bc65d223f7d1b2aa6d8b2c64454e
Reviewed-on: https://gerrit.libreoffice.org/72543
Reviewed-by: Katarina Behrens
Tested-by: Katarina Behrens
diff --git a/sc/uiconfig/scalc/ui/condformatmanager.ui
b/sc/uiconfig/scalc/ui/condformatmanager.ui
index c5e06da45e58..6423fa41829f 100644
--- a/sc/uiconfig/scalc/ui/condformatmanager.ui
+++ b/sc/uiconfig/scalc/ui/condformatmanager.ui
@@ -133,7 +133,7 @@
True
6
-First Condition
+Range
@@ -146,7 +146,7 @@
True
6
-Range
+First
Condition
commit 89189743b9795cae13c69f69cdf6901b9ed354a7
Author: Marco Cecchetti
AuthorDate: Fri Nov 30 17:20:37 2018 +0100
Commit: Marco Cecchetti
CommitDate: Mon May 20 10:31:05 2019 +0200
lok: shape selection: perform the needed unit conversion in a clever way
Change-Id: I505bd41801b5fd1898a9eddc81b102f2f7ae20b5
Reviewed-on: https://gerrit.libreoffice.org/70563
Tested-by: Jenkins
Reviewed-by: Marco Cecchetti
diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx
index 9adcea111d85..397803c96e5c 100644
--- a/cui/source/tabpages/transfrm.cxx
+++ b/cui/source/tabpages/transfrm.cxx
@@ -88,28 +88,6 @@ const sal_uInt16 SvxSlantTabPage::pSlantRanges[] =
0
};
-namespace {
-
-bool lcl_twipsNeeded(const SdrView* pView)
-{
-const bool bTiledRendering = comphelper::LibreOfficeKit::isActive();
-if (bTiledRendering)
-{
-// We gets the position in twips
-if (OutputDevice* pOutputDevice = pView->GetFirstOutputDevice())
-{
-if (pOutputDevice->GetMapMode().GetMapUnit() ==
MapUnit::Map100thMM)
-{
-return true;
-}
-}
-}
-return false;
-}
-
-} // anonymous ns
-
-
/*
|*
|* constructor of the tab dialog: adds the pages to the dialog
@@ -279,18 +257,9 @@ bool SvxAngleTabPage::FillItemSet(SfxItemSet* rSet)
const double fTmpX((GetCoreValue(*m_xMtrPosX, ePoolUnit) +
maAnchor.getX()) * fUIScale);
const double fTmpY((GetCoreValue(*m_xMtrPosY, ePoolUnit) +
maAnchor.getY()) * fUIScale);
-long nRotateX = basegfx::fround(fTmpX);
-long nRotateY = basegfx::fround(fTmpY);
-
-if (lcl_twipsNeeded(pView))
-{
-nRotateX = OutputDevice::LogicToLogic(nRotateX,
MapUnit::Map100thMM, MapUnit::MapTwip);
-nRotateY = OutputDevice::LogicToLogic(nRotateY,
MapUnit::Map100thMM, MapUnit::MapTwip);
-}
-
rSet->Put(SfxInt32Item(GetWhich(SID_ATTR_TRANSFORM_ANGLE),
m_aCtlAngle.GetRotation()));
-rSet->Put(SfxInt32Item(GetWhich(SID_ATTR_TRANSFORM_ROT_X), nRotateX));
-rSet->Put(SfxInt32Item(GetWhich(SID_ATTR_TRANSFORM_ROT_Y), nRotateY));
+rSet->Put(SfxInt32Item(GetWhich(SID_ATTR_TRANSFORM_ROT_X),
basegfx::fround(fTmpX)));
+rSet->Put(SfxInt32Item(GetWhich(SID_ATTR_TRANSFORM_ROT_Y),
basegfx::fround(fTmpY)));
bModified = true;
}
@@ -965,12 +934,6 @@ bool SvxPositionSizeTabPage::FillItemSet( SfxItemSet*
rOutAttrs )
// #101581# GetTopLeftPosition(...) needs coordinates after UI
scaling, in real PagePositions
GetTopLeftPosition(fX, fY, maRange);
-if (lcl_twipsNeeded(mpView))
-{
-fX = OutputDevice::LogicToLogic(fX, MapUnit::Map100thMM,
MapUnit::MapTwip);
-fY = OutputDevice::LogicToLogic(fY, MapUnit::Map100thMM,
MapUnit::MapTwip);
-}
-
rOutAttrs->Put(SfxInt32Item(GetWhich(SID_ATTR_TRANSFORM_POS_X),
basegfx::fround(fX)));
rOutAttrs->Put(SfxInt32Item(GetWhich(SID_ATTR_TRANSFORM_POS_Y),
basegfx::fround(fY)));
@@ -1010,12 +973,6 @@ bool
