core.git: sc/source svtools/source

2023-12-21 Thread Andreas Heinisch (via logerrit) 
 sc/source/ui/view/tabview.cxx |3 +--
 svtools/source/control/tabbar.cxx |4 +++-
 2 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 19e856aa1ade6686fa495e57386b81cabae47495
Author: Andreas Heinisch 
AuthorDate: Thu Dec 21 20:29:32 2023 +0100
Commit: Andreas Heinisch 
CommitDate: Thu Dec 21 20:32:22 2023 +0100

Revert "tdf#100584, tdf#157784 - Arrange sheets depending on the RTL 
settings"

This reverts commit 4f1b3c16f5530a2a190cab07c07c7bf63acf42c7.

Reason for revert: To many regressions.

Change-Id: I7352bb3c192d5e6c72e95c387ee551764007e97b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161152
Tested-by: Andreas Heinisch 
Reviewed-by: Andreas Heinisch 

diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx
index f580198f9bfc..44c74c5455a7 100644
--- a/sc/source/ui/view/tabview.cxx
+++ b/sc/source/ui/view/tabview.cxx
@@ -281,8 +281,7 @@ void ScTabView::DoResize( const Point& rOffset, const Size& 
rSize, bool bInner )
 if (bHasHint)
 RemoveHintWindow();
 
-// tdf#100584 - arrange sheets depending on the RTL settings
-bool bLayoutRTL = AllSettings::GetLayoutRTL();
+bool bLayoutRTL = aViewData.GetDocument().IsLayoutRTL( 
aViewData.GetTabNo() );
 tools::Long nTotalWidth = rSize.Width();
 if ( bLayoutRTL )
 nTotalWidth += 2*rOffset.X();
diff --git a/svtools/source/control/tabbar.cxx 
b/svtools/source/control/tabbar.cxx
index 73ddf396eb25..dafdf5f7e218 100644
--- a/svtools/source/control/tabbar.cxx
+++ b/svtools/source/control/tabbar.cxx
@@ -715,7 +715,9 @@ void TabBar::ImplFormat()
 const size_t nItemListSize = mpImpl->maItemList.size();
 for (size_t nItemIndex = 0; nItemIndex < nItemListSize; nItemIndex++)
 {
-auto& rItem = mpImpl->maItemList[nItemIndex];
+// tdf#100584 - arrange sheets depending on the RTL settings
+auto& rItem = mbMirrored ? mpImpl->maItemList[nItemListSize - 
nItemIndex - 1]
+ : mpImpl->maItemList[nItemIndex];
 
 // At all non-visible tabs an empty rectangle is set
 if ((nItemIndex + 1 < mnFirstPos) || (x > mnLastOffX))

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

2023-10-31 Thread Andreas Heinisch (via logerrit) 
 sc/source/ui/view/tabview.cxx |3 ++-
 svtools/source/control/tabbar.cxx |4 +---
 2 files changed, 3 insertions(+), 4 deletions(-)

New commits:
commit 4f1b3c16f5530a2a190cab07c07c7bf63acf42c7
Author: Andreas Heinisch 
AuthorDate: Tue Oct 31 15:48:44 2023 +0100
Commit: Andreas Heinisch 
CommitDate: Tue Oct 31 15:51:59 2023 +0100

tdf#100584, tdf#157784 - Arrange sheets depending on the RTL settings

The tab bar's position should be determined globally based on the RTL
settings, rather than being individually set for each sheet.

Change-Id: I0690b01c842d2da6d49b57d1adad0a8e0844087f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158730
Tested-by: Andreas Heinisch 
Reviewed-by: Andreas Heinisch 

diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx
index d158516fdb0a..25d60abc2946 100644
--- a/sc/source/ui/view/tabview.cxx
+++ b/sc/source/ui/view/tabview.cxx
@@ -280,7 +280,8 @@ void ScTabView::DoResize( const Point& rOffset, const Size& 
rSize, bool bInner )
 if (bHasHint)
 RemoveHintWindow();
 
-bool bLayoutRTL = aViewData.GetDocument().IsLayoutRTL( 
aViewData.GetTabNo() );
+// tdf#100584 - arrange sheets depending on the RTL settings
+bool bLayoutRTL = AllSettings::GetLayoutRTL();
 tools::Long nTotalWidth = rSize.Width();
 if ( bLayoutRTL )
 nTotalWidth += 2*rOffset.X();
diff --git a/svtools/source/control/tabbar.cxx 
b/svtools/source/control/tabbar.cxx
index 1690269ba234..02a23b8aea33 100644
--- a/svtools/source/control/tabbar.cxx
+++ b/svtools/source/control/tabbar.cxx
@@ -715,9 +715,7 @@ void TabBar::ImplFormat()
 const size_t nItemListSize = mpImpl->maItemList.size();
 for (size_t nItemIndex = 0; nItemIndex < nItemListSize; nItemIndex++)
 {
-// tdf#100584 - arrange sheets depending on the RTL settings
-auto& rItem = mbMirrored ? mpImpl->maItemList[nItemListSize - 
nItemIndex - 1]
- : mpImpl->maItemList[nItemIndex];
+auto& rItem = mpImpl->maItemList[nItemIndex];
 
 // At all non-visible tabs an empty rectangle is set
 if ((nItemIndex + 1 < mnFirstPos) || (x > mnLastOffX))

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

2023-10-31 Thread Andreas Heinisch (via logerrit) 
 sc/source/ui/view/tabview.cxx |3 +--
 svtools/source/control/tabbar.cxx |4 +++-
 2 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 3be361d00eb1d61543e2c8c6953e63c149fb1eb0
Author: Andreas Heinisch 
AuthorDate: Tue Oct 31 15:39:13 2023 +0100
Commit: Andreas Heinisch 
CommitDate: Tue Oct 31 15:40:01 2023 +0100

Revert "tdf#100584, tdff#157784 - Arrange sheets depending on the RTL 
settings"

This reverts commit a90d89d5b2dae2b4c3fd6a411de2160a3bf20779.

Reason for revert: Typo in the commit message

Change-Id: I58f184e2733d91aa827396868fb4f7b8e9d47a48
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158693
Tested-by: Andreas Heinisch 
Reviewed-by: Andreas Heinisch 

diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx
index 25d60abc2946..d158516fdb0a 100644
--- a/sc/source/ui/view/tabview.cxx
+++ b/sc/source/ui/view/tabview.cxx
@@ -280,8 +280,7 @@ void ScTabView::DoResize( const Point& rOffset, const Size& 
rSize, bool bInner )
 if (bHasHint)
 RemoveHintWindow();
 
-// tdf#100584 - arrange sheets depending on the RTL settings
-bool bLayoutRTL = AllSettings::GetLayoutRTL();
+bool bLayoutRTL = aViewData.GetDocument().IsLayoutRTL( 
aViewData.GetTabNo() );
 tools::Long nTotalWidth = rSize.Width();
 if ( bLayoutRTL )
 nTotalWidth += 2*rOffset.X();
diff --git a/svtools/source/control/tabbar.cxx 
b/svtools/source/control/tabbar.cxx
index 02a23b8aea33..1690269ba234 100644
--- a/svtools/source/control/tabbar.cxx
+++ b/svtools/source/control/tabbar.cxx
@@ -715,7 +715,9 @@ void TabBar::ImplFormat()
 const size_t nItemListSize = mpImpl->maItemList.size();
 for (size_t nItemIndex = 0; nItemIndex < nItemListSize; nItemIndex++)
 {
-auto& rItem = mpImpl->maItemList[nItemIndex];
+// tdf#100584 - arrange sheets depending on the RTL settings
+auto& rItem = mbMirrored ? mpImpl->maItemList[nItemListSize - 
nItemIndex - 1]
+ : mpImpl->maItemList[nItemIndex];
 
 // At all non-visible tabs an empty rectangle is set
 if ((nItemIndex + 1 < mnFirstPos) || (x > mnLastOffX))

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

2023-10-31 Thread Andreas Heinisch (via logerrit) 
 sc/source/ui/view/tabview.cxx |3 ++-
 svtools/source/control/tabbar.cxx |4 +---
 2 files changed, 3 insertions(+), 4 deletions(-)

New commits:
commit a90d89d5b2dae2b4c3fd6a411de2160a3bf20779
Author: Andreas Heinisch 
AuthorDate: Mon Oct 30 20:29:05 2023 +0100
Commit: Andreas Heinisch 
CommitDate: Tue Oct 31 15:37:57 2023 +0100

tdf#100584, tdff#157784 - Arrange sheets depending on the RTL settings

The tab bar's position should be determined globally based on the RTL 
settings, rather than being individually set for each sheet.

Change-Id: I0906f85058a5b4250540dda07740eec61f46d299
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158675
Tested-by: Andreas Heinisch 
Reviewed-by: Andreas Heinisch 

diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx
index d158516fdb0a..25d60abc2946 100644
--- a/sc/source/ui/view/tabview.cxx
+++ b/sc/source/ui/view/tabview.cxx
@@ -280,7 +280,8 @@ void ScTabView::DoResize( const Point& rOffset, const Size& 
rSize, bool bInner )
 if (bHasHint)
 RemoveHintWindow();
 
-bool bLayoutRTL = aViewData.GetDocument().IsLayoutRTL( 
aViewData.GetTabNo() );
+// tdf#100584 - arrange sheets depending on the RTL settings
+bool bLayoutRTL = AllSettings::GetLayoutRTL();
 tools::Long nTotalWidth = rSize.Width();
 if ( bLayoutRTL )
 nTotalWidth += 2*rOffset.X();
diff --git a/svtools/source/control/tabbar.cxx 
b/svtools/source/control/tabbar.cxx
index 1690269ba234..02a23b8aea33 100644
--- a/svtools/source/control/tabbar.cxx
+++ b/svtools/source/control/tabbar.cxx
@@ -715,9 +715,7 @@ void TabBar::ImplFormat()
 const size_t nItemListSize = mpImpl->maItemList.size();
 for (size_t nItemIndex = 0; nItemIndex < nItemListSize; nItemIndex++)
 {
-// tdf#100584 - arrange sheets depending on the RTL settings
-auto& rItem = mbMirrored ? mpImpl->maItemList[nItemListSize - 
nItemIndex - 1]
- : mpImpl->maItemList[nItemIndex];
+auto& rItem = mpImpl->maItemList[nItemIndex];
 
 // At all non-visible tabs an empty rectangle is set
 if ((nItemIndex + 1 < mnFirstPos) || (x > mnLastOffX))

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

2022-03-24 Thread Heiko Tietze (via logerrit) 
 sc/source/ui/miscdlgs/autofmt.cxx|4 +++-
 svtools/source/control/scriptedtext.cxx  |6 --
 sw/source/ui/table/autoformatpreview.cxx |4 +++-
 3 files changed, 10 insertions(+), 4 deletions(-)

New commits:
commit 5b2238ce779c44378f0a86e498eda39f50df3542
Author: Heiko Tietze 
AuthorDate: Thu Mar 24 08:40:24 2022 +0100
Commit: Heiko Tietze 
CommitDate: Thu Mar 24 15:36:03 2022 +0100

Resolves tdf#140439 - AutoFormat Table preview not using DOCCOLOR

WYSIWYG preview should use the actual document color instead
the dialog/window background

Change-Id: Ifff07b2f754ed88cb7e60e0494092e266d3c7cf1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132023
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/sc/source/ui/miscdlgs/autofmt.cxx 
b/sc/source/ui/miscdlgs/autofmt.cxx
index 375294c05358..877c412a5966 100644
--- a/sc/source/ui/miscdlgs/autofmt.cxx
+++ b/sc/source/ui/miscdlgs/autofmt.cxx
@@ -50,6 +50,8 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 
 #define FRAME_OFFSET 4
 
@@ -497,7 +499,7 @@ void ScAutoFmtPreview::DoPaint(vcl::RenderContext& 
rRenderContext)
 
 Size aWndSize(GetOutputSizePixel());
 vcl::Font aFont(aVD->GetFont());
-Color 
aBackCol(rRenderContext.GetSettings().GetStyleSettings().GetWindowColor());
+const Color& aBackCol = SC_MOD()->GetColorConfig().GetColorValue( 
::svtools::DOCCOLOR ).nColor;
 tools::Rectangle aRect(Point(), aWndSize);
 
 aFont.SetTransparent( true );
diff --git a/svtools/source/control/scriptedtext.cxx 
b/svtools/source/control/scriptedtext.cxx
index fc7e3e8a703e..18c6445b95e5 100644
--- a/svtools/source/control/scriptedtext.cxx
+++ b/svtools/source/control/scriptedtext.cxx
@@ -262,8 +262,10 @@ void SvtScriptedTextHelper_Impl::DrawText( const Point& 
_rPos )
 {
 nNextPos = maPosVec[ nPosVecIndex++ ];
 nScript = maScriptVec[ nVecIndex ];
-
-SetOutDevFont( nScript );
+vcl::Font aFont = GetFont( nScript );
+mrOutDevice.SetFont( aFont );
+if (aFont.GetColor() == COL_AUTO)
+mrOutDevice.SetTextColor( mrOutDevice.GetFillColor().IsDark() ? 
COL_WHITE : COL_BLACK);
 mrOutDevice.DrawText( aCurrPos, maText, nThisPos, nNextPos - nThisPos 
);
 aCurrPos.AdjustX(maWidthVec[ nVecIndex++ ] );
 aCurrPos.AdjustX(mrOutDevice.GetTextHeight() / 5 );   // add 20% of 
font height as portion spacing
diff --git a/sw/source/ui/table/autoformatpreview.cxx 
b/sw/source/ui/table/autoformatpreview.cxx
index ed101b60a81c..2a2318252c9f 100644
--- a/sw/source/ui/table/autoformatpreview.cxx
+++ b/sw/source/ui/table/autoformatpreview.cxx
@@ -36,6 +36,8 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 
 #include 
 
@@ -442,7 +444,7 @@ void AutoFormatPreview::Paint(vcl::RenderContext& 
rRenderContext, const tools::R
 
 rRenderContext.SetFont(aFont);
 rRenderContext.SetLineColor();
-const Color& rWinColor = 
rRenderContext.GetSettings().GetStyleSettings().GetWindowColor();
+const Color& rWinColor = 
SW_MOD()->GetColorConfig().GetColorValue(::svtools::DOCCOLOR).nColor;
 rRenderContext.SetBackground(Wallpaper(rWinColor));
 rRenderContext.SetFillColor(rWinColor);

[Libreoffice-commits] core.git: sc/source svtools/source svtools/uiconfig svtools/UIConfig_svt.mk svx/uiconfig svx/UIConfig_svx.mk vcl/source vcl/uiconfig vcl/UIConfig_vcl.mk

2021-02-20 Thread Caolán McNamara (via logerrit) 
 sc/source/ui/cctrl/checklistmenu.cxx |2 +-
 svtools/UIConfig_svt.mk  |1 +
 svtools/source/control/toolbarmenu.cxx   |4 ++--
 svtools/uiconfig/ui/interimparent.ui |2 +-
 svx/UIConfig_svx.mk  |3 ---
 vcl/UIConfig_vcl.mk  |2 ++
 vcl/source/control/calendar.cxx  |2 +-
 vcl/uiconfig/ui/interimdockparent.ui |2 +-
 vcl/uiconfig/ui/interimtearableparent.ui |2 +-
 9 files changed, 10 insertions(+), 10 deletions(-)

New commits:
commit 1e0ade8b56c644868a72156186ab5c83e2abfb69
Author: Caolán McNamara 
AuthorDate: Fri Feb 19 20:24:30 2021 +
Commit: Caolán McNamara 
CommitDate: Sat Feb 20 11:27:55 2021 +0100

move docking adapters to vcl

Change-Id: I9be6f65734c24196758dea6853219a168c53a7fd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111250
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/sc/source/ui/cctrl/checklistmenu.cxx 
b/sc/source/ui/cctrl/checklistmenu.cxx
index 6608912d3f2a..9dd2e5a8c0c9 100644
--- a/sc/source/ui/cctrl/checklistmenu.cxx
+++ b/sc/source/ui/cctrl/checklistmenu.cxx
@@ -568,7 +568,7 @@ ScCheckListMenuControl::~ScCheckListMenuControl()
 ScCheckListMenuWindow::ScCheckListMenuWindow(vcl::Window* pParent, ScDocument* 
pDoc, bool bCanHaveSubMenu,
  bool bTreeMode, int nWidth, 
ScCheckListMenuWindow* pParentMenu,
  vcl::ILibreOfficeKitNotifier* 
pNotifier)
-: DockingWindow(pParent, "InterimDockParent", 
"svx/ui/interimdockparent.ui")
+: DockingWindow(pParent, "InterimDockParent", 
"vcl/ui/interimdockparent.ui")
 , mxParentMenu(pParentMenu)
 , mxBox(m_pUIBuilder->get("box"))
 {
diff --git a/svtools/UIConfig_svt.mk b/svtools/UIConfig_svt.mk
index 5df446e6970e..7aab72726644 100644
--- a/svtools/UIConfig_svt.mk
+++ b/svtools/UIConfig_svt.mk
@@ -21,6 +21,7 @@ $(eval $(call gb_UIConfig_add_uifiles,svt,\
svtools/uiconfig/ui/fixedimagecontrol \
svtools/uiconfig/ui/fixedtextcontrol \
svtools/uiconfig/ui/graphicexport \
+   svtools/uiconfig/ui/interimparent \
svtools/uiconfig/ui/inputbox \
svtools/uiconfig/ui/javadisableddialog \
svtools/uiconfig/ui/listcontrol \
diff --git a/svtools/source/control/toolbarmenu.cxx 
b/svtools/source/control/toolbarmenu.cxx
index 98f74b605e25..802321bb12c6 100644
--- a/svtools/source/control/toolbarmenu.cxx
+++ b/svtools/source/control/toolbarmenu.cxx
@@ -174,11 +174,11 @@ InterimToolbarPopup::InterimToolbarPopup(const 
css::uno::Reference 
xPopup, bool bTearable)
 : DockingWindow(pParent,
 !bTearable ? OString("InterimDockParent") : 
OString("InterimTearableParent"),
-!bTearable ? OUString("svx/ui/interimdockparent.ui") : 
OUString("svx/ui/interimtearableparent.ui"),
+!bTearable ? OUString("vcl/ui/interimdockparent.ui") : 
OUString("vcl/ui/interimtearableparent.ui"),
 rFrame)
 , m_xBox(m_pUIBuilder->get("box"))
 , m_xFrame(rFrame)
-, m_xBuilder(Application::CreateInterimBuilder(m_xBox.get(), 
"svx/ui/interimparent.ui", false))
+, m_xBuilder(Application::CreateInterimBuilder(m_xBox.get(), 
"svt/ui/interimparent.ui", false))
 , m_xContainer(m_xBuilder->weld_container("container"))
 , m_xPopup(std::move(xPopup))
 {
diff --git a/svx/uiconfig/ui/interimparent.ui 
b/svtools/uiconfig/ui/interimparent.ui
similarity index 94%
rename from svx/uiconfig/ui/interimparent.ui
rename to svtools/uiconfig/ui/interimparent.ui
index 20ae8f229e27..7502685e3ed4 100644
--- a/svx/uiconfig/ui/interimparent.ui
+++ b/svtools/uiconfig/ui/interimparent.ui
@@ -1,6 +1,6 @@
 
 
-
+
   
   
 True
diff --git a/svx/UIConfig_svx.mk b/svx/UIConfig_svx.mk
index b8e18d763c1f..667ef8ad8f33 100644
--- a/svx/UIConfig_svx.mk
+++ b/svx/UIConfig_svx.mk
@@ -84,9 +84,6 @@ $(eval $(call gb_UIConfig_add_uifiles,svx,\
svx/uiconfig/ui/imapdialog \
svx/uiconfig/ui/imapmenu \
svx/uiconfig/ui/inspectortextpanel \
-   svx/uiconfig/ui/interimdockparent \
-   svx/uiconfig/ui/interimparent \
-   svx/uiconfig/ui/interimtearableparent \
svx/uiconfig/ui/labelbox \
svx/uiconfig/ui/lightingwindow \
svx/uiconfig/ui/linkwarndialog \
diff --git a/vcl/UIConfig_vcl.mk b/vcl/UIConfig_vcl.mk
index faaa0f25c673..8047f56e7dba 100644
--- a/vcl/UIConfig_vcl.mk
+++ b/vcl/UIConfig_vcl.mk
@@ -16,6 +16,8 @@ $(eval $(call gb_UIConfig_add_uifiles,vcl,\
vcl/uiconfig/ui/editmenu \
vcl/uiconfig/ui/errornocontentdialog \
vcl/uiconfig/ui/errornoprinterdialog \
+   vcl/uiconfig/ui/interimdockparent \
+   vcl/uiconfig/ui/interimtearableparent \
vcl/uiconfig/ui/menutogglebutton \
vcl/uiconfig/ui/printdialog \
vcl/uiconfig/ui/printerdevicepage \
diff --git a/vcl/source/control/calendar.cxx

[Libreoffice-commits] core.git: sc/source svtools/source sw/source vcl/osx vcl/source vcl/unx vcl/win

2017-05-18 Thread Tor Lillqvist 
 sc/source/ui/view/hdrcont.cxx   |2 +-
 sc/source/ui/view/prevwsh.cxx   |2 +-
 svtools/source/control/ruler.cxx|2 +-
 sw/source/uibase/docvw/srcedtw.cxx  |4 ++--
 sw/source/uibase/uiview/scroll.cxx  |2 +-
 vcl/osx/salframeview.mm |4 
 vcl/source/control/edit.cxx |6 +++---
 vcl/source/outdev/font.cxx  |1 -
 vcl/source/outdev/outdev.cxx|2 +-
 vcl/source/outdev/textline.cxx  |2 --
 vcl/source/window/clipping.cxx  |4 ++--
 vcl/source/window/floatwin.cxx  |8 +++-
 vcl/source/window/mouse.cxx |5 -
 vcl/source/window/paint.cxx |   16 +++-
 vcl/source/window/window.cxx|   12 
 vcl/source/window/window2.cxx   |4 ++--
 vcl/source/window/winproc.cxx   |5 ++---
 vcl/unx/generic/window/salframe.cxx |3 ---
 vcl/unx/gtk/gtksalframe.cxx |3 ---
 vcl/unx/gtk3/gtk3gtkframe.cxx   |4 +---
 vcl/win/window/salframe.cxx |3 ---
 21 files changed, 31 insertions(+), 63 deletions(-)

New commits:
commit d89fa2bd4944625e2dbe56d5709a3f126db24f21
Author: Tor Lillqvist 
Date:   Tue May 16 21:48:02 2017 +0300

Clean up a set of RTL-related comments

It is fairly pointless to have a comment like "--- RTL --- (mirror
mouse pos)" in front of code that obviously is related to RTL anyway,
like "if( AllSettings::GetLayoutRTL() )". Also, the fact that many
comment were exactly the same indicates that they has been added as an
in-line version control change marker.

In other places, comments were informational, but no need for them to
include yet another metasyntax, "--- RTL ---". Just "RTL:" works fine.

Change-Id: I20feef308ed8ac9d32a8bf440fc20b442753c4ff

diff --git a/sc/source/ui/view/hdrcont.cxx b/sc/source/ui/view/hdrcont.cxx
index e63f539b56fd..de94d101b6b9 100644
--- a/sc/source/ui/view/hdrcont.cxx
+++ b/sc/source/ui/view/hdrcont.cxx
@@ -64,7 +64,7 @@ ScHeaderControl::ScHeaderControl( vcl::Window* pParent, 
SelectionEngine* pSelect
 bInRefMode  ( false ),
 pTabView( pTab )
 {
-// --- RTL --- no default mirroring for this window, the spreadsheet itself
+// RTL: no default mirroring for this window, the spreadsheet itself
 // is also not mirrored
 // mirror the vertical window for correct border drawing
 // table layout depends on sheet format, not UI setting, so the
diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx
index 06a4d189cf29..37097ed5474e 100644
--- a/sc/source/ui/view/prevwsh.cxx
+++ b/sc/source/ui/view/prevwsh.cxx
@@ -124,7 +124,7 @@ void ScPreviewShell::Construct( vcl::Window* pParent )
 pHorScroll = VclPtr::Create(pParent, WB_HSCROLL );
 pVerScroll = VclPtr::Create(pParent, WB_VSCROLL);
 
-// SSA: --- RTL --- no mirroring for horizontal scrollbars
+// RTL: no mirroring for horizontal scrollbars
 pHorScroll->EnableRTL( false );
 
 pHorScroll->SetEndScrollHdl( LINK( this, ScPreviewShell, ScrollHandler ) );
diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx
index 57f0311940bd..a931237f1d31 100644
--- a/svtools/source/control/ruler.cxx
+++ b/svtools/source/control/ruler.cxx
@@ -215,7 +215,7 @@ void Ruler::ImplInit( WinBits nWinBits )
 {
 nWinBits |= WB_HORZ;
 
-// --- RTL --- no UI mirroring for horizontal rulers, because
+// RTL: no UI mirroring for horizontal rulers, because
 // the document is also not mirrored
 EnableRTL( false );
 }
diff --git a/sw/source/uibase/docvw/srcedtw.cxx 
b/sw/source/uibase/docvw/srcedtw.cxx
index 6ccfee3d61b1..dde4240f0262 100644
--- a/sw/source/uibase/docvw/srcedtw.cxx
+++ b/sw/source/uibase/docvw/srcedtw.cxx
@@ -507,12 +507,12 @@ void SwSrcEditWindow::CreateTextEngine()
 
 // create Scrollbars
 m_pHScrollbar = VclPtr::Create(this, WB_3DLOOK 
|WB_HSCROLL|WB_DRAG);
-m_pHScrollbar->EnableRTL( false ); // --- RTL --- no mirroring for 
scrollbars
+m_pHScrollbar->EnableRTL( false );
 m_pHScrollbar->SetScrollHdl(LINK(this, SwSrcEditWindow, ScrollHdl));
 m_pHScrollbar->Show();
 
 m_pVScrollbar = VclPtr::Create(this, WB_3DLOOK 
|WB_VSCROLL|WB_DRAG);
-m_pVScrollbar->EnableRTL( false ); // --- RTL --- no mirroring for 
scrollbars
+m_pVScrollbar->EnableRTL( false );
 m_pVScrollbar->SetScrollHdl(LINK(this, SwSrcEditWindow, ScrollHdl));
 m_pHScrollbar->EnableDrag();
 m_pVScrollbar->Show();
diff --git a/sw/source/uibase/uiview/scroll.cxx 
b/sw/source/uibase/uiview/scroll.cxx
index e8474e16bab4..70a69d9d1046 100644
--- a/sw/source/uibase/uiview/scroll.cxx
+++ b/sw/source/uibase/uiview/scroll.cxx
@@ -31,7 +31,7 @@ SwScrollbar::SwScrollbar( vcl::Window *pWin, bool bHoriz ) :
 bVisible(false),
 bSizeSet(false)
 {
-// SSA: --- RTL --- no mirroring for horizontal scrollbars
+// No

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

2016-06-12 Thread Noel Grandin 
 sc/source/core/data/document.cxx   |8 
 sc/source/filter/xml/sheetdata.cxx |2 +-
 svtools/source/control/toolbarmenu.cxx |4 ++--
 vcl/source/window/menu.cxx |8 
 vcl/unx/gtk/salprn-gtk.cxx |2 +-
 5 files changed, 12 insertions(+), 12 deletions(-)

New commits:
commit 2ed5fa14f0e7624db241fde26e10fdd1009adfc7
Author: Noel Grandin 
Date:   Sat Jun 11 15:00:37 2016 +0200

remove some unnecessary casting

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

diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 2fcce07..8e22b96 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -6499,12 +6499,12 @@ ScAddress ScDocument::GetNotePosition( size_t nIndex ) 
const
 return ScAddress(nCol, nRow, nTab);
 
 OSL_FAIL("note not found");
-return ScAddress(ScAddress::INITIALIZE_INVALID);
+return ScAddress::INITIALIZE_INVALID;
 }
 }
 
 OSL_FAIL("note not found");
-return ScAddress(ScAddress::INITIALIZE_INVALID);
+return ScAddress::INITIALIZE_INVALID;
 }
 
 ScAddress ScDocument::GetNotePosition( size_t nIndex, SCTAB nTab ) const
@@ -6526,11 +6526,11 @@ ScAddress ScDocument::GetNotePosition( size_t nIndex, 
SCTAB nTab ) const
 return ScAddress(nCol, nRow, nTab);
 
 OSL_FAIL("note not found");
-return ScAddress(ScAddress::INITIALIZE_INVALID);
+return ScAddress::INITIALIZE_INVALID;
 }
 
 OSL_FAIL("note not found");
-return ScAddress(ScAddress::INITIALIZE_INVALID);
+return ScAddress::INITIALIZE_INVALID;
 }
 
 SCROW ScDocument::GetNotePosition( SCTAB nTab, SCCOL nCol, size_t nIndex ) 
const
diff --git a/sc/source/filter/xml/sheetdata.cxx 
b/sc/source/filter/xml/sheetdata.cxx
index e5e771d..1d1cfb9 100644
--- a/sc/source/filter/xml/sheetdata.cxx
+++ b/sc/source/filter/xml/sheetdata.cxx
@@ -28,7 +28,7 @@
 ScSheetSaveData::ScSheetSaveData() :
 mnStartTab( -1 ),
 mnStartOffset( -1 ),
-maPreviousNote( OUString(), OUString(), 
ScAddress(ScAddress::INITIALIZE_INVALID) ),
+maPreviousNote( OUString(), OUString(), ScAddress::INITIALIZE_INVALID ),
 mbInSupportedSave( false )
 {
 }
diff --git a/svtools/source/control/toolbarmenu.cxx 
b/svtools/source/control/toolbarmenu.cxx
index c919c6b..51f1e8e 100644
--- a/svtools/source/control/toolbarmenu.cxx
+++ b/svtools/source/control/toolbarmenu.cxx
@@ -548,7 +548,7 @@ static long 
ImplGetNativeCheckAndRadioSize(vcl::RenderContext& rRenderContext, l
 if (rRenderContext.IsNativeControlSupported(ControlType::MenuPopup, 
PART_MENU_ITEM_CHECK_MARK))
 {
 if (rRenderContext.GetNativeControlRegion(ControlType::MenuPopup, 
ControlPart(PART_MENU_ITEM_CHECK_MARK),
-  aCtrlRegion, 
ControlState(ControlState::ENABLED), aVal, OUString(),
+  aCtrlRegion, 
ControlState::ENABLED, aVal, OUString(),
   aNativeBounds, 
aNativeContent)
 )
 {
@@ -559,7 +559,7 @@ static long 
ImplGetNativeCheckAndRadioSize(vcl::RenderContext& rRenderContext, l
 if (rRenderContext.IsNativeControlSupported(ControlType::MenuPopup, 
PART_MENU_ITEM_RADIO_MARK))
 {
 if (rRenderContext.GetNativeControlRegion(ControlType::MenuPopup, 
ControlPart(PART_MENU_ITEM_RADIO_MARK),
-  aCtrlRegion, 
ControlState(ControlState::ENABLED), aVal, OUString(),
+  aCtrlRegion, ControlState::ENABLED, 
aVal, OUString(),
   aNativeBounds, aNativeContent)
 )
 {
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index e835c83..c128f54 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -1369,7 +1369,7 @@ Size 
Menu::ImplGetNativeCheckAndRadioSize(vcl::RenderContext& rRenderContext, lo
 if (rRenderContext.IsNativeControlSupported(ControlType::MenuPopup, 
PART_MENU_ITEM_CHECK_MARK))
 {
 if (rRenderContext.GetNativeControlRegion(ControlType::MenuPopup, 
ControlPart(PART_MENU_ITEM_CHECK_MARK),
-  aCtrlRegion, 
ControlState(ControlState::ENABLED), aVal, OUString(),
+  aCtrlRegion, 
ControlState::ENABLED, aVal, OUString(),
   aNativeBounds, aNativeContent))
 {
 rCheckHeight = aNativeBounds.GetHeight();
@@ -1379,7 +1379,7 @@ Size 
Menu::ImplGetNativeCheckAndRadioSize(vcl::RenderContext& rRenderContext, lo
 if

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

2016-03-10 Thread Dennis Francis 
 sc/source/ui/cctrl/checklistmenu.cxx  |  181 ++
 sc/source/ui/inc/checklistmenu.hxx|   44 +++-
 svtools/source/contnr/treelistbox.cxx |2 
 3 files changed, 181 insertions(+), 46 deletions(-)

New commits:
commit d799daa48987c4fa19696967dd98f690e7b94c4f
Author: Dennis Francis 
Date:   Sat Jan 30 17:54:58 2016 +0530

tdf#97344 : Allow focus change using mouse in autofilter popup

Also modified CycleFocus() to skip controls that are
disabled.

Change-Id: I6d84e0d4aacc719b83c70e92a17f58f1756ff072
Reviewed-on: https://gerrit.libreoffice.org/21922
Tested-by: Jenkins 
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 

diff --git a/sc/source/ui/cctrl/checklistmenu.cxx 
b/sc/source/ui/cctrl/checklistmenu.cxx
index 865fb7b..cbf0caa 100644
--- a/sc/source/ui/cctrl/checklistmenu.cxx
+++ b/sc/source/ui/cctrl/checklistmenu.cxx
@@ -875,33 +875,35 @@ void ScCheckListMenuWindow::CancelButton::Click()
 
 ScCheckListMenuWindow::ScCheckListMenuWindow(vcl::Window* pParent, ScDocument* 
pDoc) :
 ScMenuFloatingWindow(pParent, pDoc),
-maEdSearch(VclPtr::Create(this)),
+maEdSearch(VclPtr::Create(this)),
 maChecks(VclPtr::Create(this,  WB_HASBUTTONS | WB_HASLINES 
| WB_HASLINESATROOT | WB_HASBUTTONSATROOT) ),
 maChkToggleAll(VclPtr::Create(this, 0)),
 maBtnSelectSingle(VclPtr::Create(this, 0)),
 maBtnUnselectSingle(VclPtr::Create(this, 0)),
 maBtnOk(VclPtr::Create(this)),
 maBtnCancel(VclPtr::Create(this)),
-mnCurTabStop(0),
 mpExtendedData(nullptr),
 mpOKAction(nullptr),
 mpPopupEndAction(nullptr),
 maWndSize(),
-mePrevToggleAllState(TRISTATE_INDET)
+mePrevToggleAllState(TRISTATE_INDET),
+maTabStops(this)
 {
 sal_Int32 nScaleFactor = GetDPIScaleFactor();
 
 maWndSize = Size(200 * nScaleFactor, 330 * nScaleFactor);
 
-maTabStopCtrls.reserve(8);
-maTabStopCtrls.push_back(this);
-maTabStopCtrls.push_back(maEdSearch.get());
-maTabStopCtrls.push_back(maChecks.get());
-maTabStopCtrls.push_back(maChkToggleAll.get());
-maTabStopCtrls.push_back(maBtnSelectSingle.get());
-maTabStopCtrls.push_back(maBtnUnselectSingle.get());
-maTabStopCtrls.push_back(maBtnOk.get());
-maTabStopCtrls.push_back(maBtnCancel.get());
+maTabStops.AddTabStop( this );
+maTabStops.AddTabStop( maEdSearch.get() );
+maTabStops.AddTabStop( maChecks.get() );
+maTabStops.AddTabStop( maChkToggleAll.get() );
+maTabStops.AddTabStop( maBtnSelectSingle.get() );
+maTabStops.AddTabStop( maBtnUnselectSingle.get() );
+maTabStops.AddTabStop( maBtnOk.get() );
+maTabStops.AddTabStop( maBtnCancel.get() );
+
+maEdSearch->SetTabStopsContainer(  );
+maChecks->SetTabStopsContainer(  );
 
 // Enable type-ahead search in the check list box.
 maChecks->SetStyle(maChecks->GetStyle() | WB_QUICK_SEARCH);
@@ -921,7 +923,7 @@ void ScCheckListMenuWindow::dispose()
 maBtnUnselectSingle.disposeAndClear();
 maBtnOk.disposeAndClear();
 maBtnCancel.disposeAndClear();
-maTabStopCtrls.clear();
+maTabStops.clear();
 ScMenuFloatingWindow::dispose();
 }
 
@@ -1171,30 +1173,6 @@ void ScCheckListMenuWindow::selectCurrentMemberOnly(bool 
bSet)
 maChecks->CheckEntry(pEntry, bSet );
 }
 
-void ScCheckListMenuWindow::cycleFocus(bool bReverse)
-{
-maTabStopCtrls[mnCurTabStop]->SetFakeFocus(false);
-maTabStopCtrls[mnCurTabStop]->LoseFocus();
-if (mnCurTabStop == 0)
-clearSelectedMenuItem();
-
-if (bReverse)
-{
-if (mnCurTabStop > 0)
---mnCurTabStop;
-else
-mnCurTabStop = maTabStopCtrls.size() - 1;
-}
-else
-{
-++mnCurTabStop;
-if (mnCurTabStop >= maTabStopCtrls.size())
-mnCurTabStop = 0;
-}
-maTabStopCtrls[mnCurTabStop]->SetFakeFocus(true);
-maTabStopCtrls[mnCurTabStop]->GrabFocus();
-}
-
 IMPL_LINK_TYPED( ScCheckListMenuWindow, ButtonHdl, Button*, pBtn, void )
 {
 if (pBtn == maBtnOk.get())
@@ -1319,7 +1297,7 @@ bool ScCheckListMenuWindow::Notify(NotifyEvent& rNEvt)
 bool bShift = rCode.IsShift();
 if (rCode.GetCode() == KEY_TAB)
 {
-cycleFocus(bShift);
+maTabStops.CycleFocus(bShift);
 return true;
 }
 }
@@ -1351,7 +1329,7 @@ void ScCheckListMenuWindow::Paint(vcl::RenderContext& 
rRenderContext, const Rect
 
 vcl::Window* ScCheckListMenuWindow::GetPreferredKeyInputWindow()
 {
-return maTabStopCtrls[mnCurTabStop];
+return maTabStops.GetCurrentControl();
 }
 
 Reference ScCheckListMenuWindow::CreateAccessible()
@@ -1468,8 +1446,105 @@ void ScCheckListMenuWindow::addMember(const OUString& 
rName, bool bVisible)
 maMembers.push_back(aMember);
 }
 
+ScTabStops::ScTabStops( ScCheckListMenuWindow* pMenuWin ) :
+mpMenuWindow( pMenuWin ),
+maControlToPos(