fpicker/source/office/RemoteFilesDialog.cxx | 2 +- fpicker/source/office/fileview.cxx | 2 +- fpicker/source/office/iodlg.cxx | 4 ++-- sw/source/ui/fldui/fldref.cxx | 12 ++++++++++++ 4 files changed, 16 insertions(+), 4 deletions(-)
New commits: commit 66a71a288bea335cd5737710ee2f7e36ebd934a4 Author: Caolán McNamara <[email protected]> AuthorDate: Tue May 3 20:40:35 2022 +0100 Commit: Caolán McNamara <[email protected]> CommitDate: Wed May 4 11:57:26 2022 +0200 tdf#131725 use first page directionality for x-reference dialog TreeView Change-Id: Ib827f4e73266f6416ba8459214263545291c4727 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133779 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx index 5392df80463e..1fbd69c9f10e 100644 --- a/sw/source/ui/fldui/fldref.cxx +++ b/sw/source/ui/fldui/fldref.cxx @@ -22,6 +22,7 @@ #include <expfld.hxx> #include <swmodule.hxx> #include "fldref.hxx" +#include <frmatr.hxx> #include <reffld.hxx> #include <wrtsh.hxx> @@ -34,8 +35,10 @@ #include <osl/diagnose.h> #include <comphelper/string.hxx> +#include <editeng/frmdiritem.hxx> #include <o3tl/safeint.hxx> #include <o3tl/string_view.hxx> +#include <vcl/settings.hxx> #define REFFLDFLAG 0x4000 #define REFFLDFLAG_BOOKMARK 0x4800 @@ -197,6 +200,15 @@ void SwFieldRefPage::Reset(const SfxItemSet* ) if (!pSh) return; + // tdf#148432 in LTR UI override the navigator treeview direction based on + // the first page directionality + if (!AllSettings::GetLayoutRTL()) + { + const SwPageDesc& rDesc = pSh->GetPageDesc(0); + const SvxFrameDirectionItem& rFrameDir = rDesc.GetMaster().GetFrameDir(); + m_xSelectionToolTipLB->set_direction(rFrameDir.GetValue() == SvxFrameDirection::Horizontal_RL_TB); + } + const size_t nFieldTypeCnt = pSh->GetFieldTypeCount(SwFieldIds::SetExp); OSL_ENSURE( nFieldTypeCnt < o3tl::make_unsigned(REFFLDFLAG), "<SwFieldRefPage::Reset> - Item index will overlap flags!" ); commit 5493ddc18ffd256ae85ef6aa26649f177164ac7e Author: Stephan Bergmann <[email protected]> AuthorDate: Wed May 4 10:01:05 2022 +0200 Commit: Stephan Bergmann <[email protected]> CommitDate: Wed May 4 11:57:03 2022 +0200 Just use Any ctor instead of makeAny in fpicker Change-Id: Ib23b10759bdc7c2eca4b585992756075e2642dd4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133807 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <[email protected]> diff --git a/fpicker/source/office/RemoteFilesDialog.cxx b/fpicker/source/office/RemoteFilesDialog.cxx index 21fc6a28d8d1..4536690f9154 100644 --- a/fpicker/source/office/RemoteFilesDialog.cxx +++ b/fpicker/source/office/RemoteFilesDialog.cxx @@ -133,7 +133,7 @@ RemoteFilesDialog::~RemoteFilesDialog() OUString sUserData = m_xFileView->GetConfigString(); aDlgOpt.SetUserItem( "UserData", - makeAny( sSize + sUserData ) ); + Any( sSize + sUserData ) ); } // save services diff --git a/fpicker/source/office/fileview.cxx b/fpicker/source/office/fileview.cxx index e83b42bd7ecf..7e78f773ed84 100644 --- a/fpicker/source/office/fileview.cxx +++ b/fpicker/source/office/fileview.cxx @@ -771,7 +771,7 @@ bool ViewTabListBox_Impl::Kill( const OUString& rContent ) try { ::ucbhelper::Content aCnt( rContent, mxCmdEnv, comphelper::getProcessComponentContext() ); - aCnt.executeCommand( "delete", makeAny( true ) ); + aCnt.executeCommand( "delete", Any( true ) ); } catch( css::ucb::CommandAbortedException const & ) { diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx index 75b51850bf35..44a3fdca23ab 100644 --- a/fpicker/source/office/iodlg.cxx +++ b/fpicker/source/office/iodlg.cxx @@ -470,7 +470,7 @@ SvtFileDialog::~SvtFileDialog() aDlgOpt.SetWindowState(OStringToOUString(m_xDialog->get_window_state(WindowStateMask::All), RTL_TEXTENCODING_UTF8)); OUString sUserData = m_xFileView->GetConfigString(); aDlgOpt.SetUserItem( "UserData", - makeAny( sUserData ) ); + Any( sUserData ) ); } m_xFileView->SetSelectHdl(Link<SvtFileView*,void>()); @@ -1403,7 +1403,7 @@ void SvtFileDialog::displayIOException( const OUString& _rURL, IOErrorCode _eCod // let and interaction handler handle this exception rtl::Reference<::comphelper::OInteractionRequest> pRequest = - new ::comphelper::OInteractionRequest( makeAny( aException ) ); + new ::comphelper::OInteractionRequest( Any( aException ) ); pRequest->addContinuation( new ::comphelper::OInteractionAbort( ) ); Reference< XInteractionHandler2 > xHandler(
