strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request 'actualizacion-master-2024-12-06' (#5) from actualizacion-master-2024-12-06 into master

Browse source 
Reviewed-on: #5
This commit is contained in:
iapz 2024-12-06 00:05:27 -06:00
commit 02cf82760e
477 changed files with 5636 additions and 4732 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
accessibility/Library_acc.mk
View file

@ -71,11 +71,7 @@ $(eval $(call gb_Library_add_exception_objects,acc,\
accessibility/source/extended/textwindowaccessibility \
accessibility/source/helper/acc_factory \
accessibility/source/helper/accresmgr \
accessibility/source/helper/characterattributeshelper \
accessibility/source/helper/IComboListBoxHelper \
accessibility/source/standard/accessiblemenubasecomponent \
accessibility/source/standard/accessiblemenucomponent \
accessibility/source/standard/accessiblemenuitemcomponent \
accessibility/source/standard/floatingwindowaccessible \
accessibility/source/standard/svtaccessiblenumericfield \
accessibility/source/standard/vclxaccessiblebox \
@ -92,11 +88,6 @@ $(eval $(call gb_Library_add_exception_objects,acc,\
accessibility/source/standard/vclxaccessiblelist \
accessibility/source/standard/vclxaccessiblelistbox \
accessibility/source/standard/vclxaccessiblelistitem \
accessibility/source/standard/vclxaccessiblemenu \
accessibility/source/standard/vclxaccessiblemenubar \
accessibility/source/standard/vclxaccessiblemenuitem \
accessibility/source/standard/vclxaccessiblemenuseparator \
accessibility/source/standard/vclxaccessiblepopupmenu \
accessibility/source/standard/vclxaccessibleradiobutton \
accessibility/source/standard/vclxaccessiblescrollbar \
accessibility/source/standard/vclxaccessiblestatusbar \

1
accessibility/inc/extended/accessibletabbar.hxx
View file

@ -79,7 +79,6 @@ namespace accessibility
virtual sal_Int32 SAL_CALL getBackground( ) override;
// XAccessibleExtendedComponent
virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont( ) override;
virtual OUString SAL_CALL getTitledBorderText( ) override;
virtual OUString SAL_CALL getToolTipText( ) override;
};

1
accessibility/inc/extended/accessibletabbarpage.hxx
View file

@ -93,7 +93,6 @@ namespace accessibility
virtual sal_Int32 SAL_CALL getBackground( ) override;
// XAccessibleExtendedComponent
virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont( ) override;
virtual OUString SAL_CALL getTitledBorderText( ) override;
virtual OUString SAL_CALL getToolTipText( ) override;
};

1
accessibility/inc/extended/accessibletabbarpagelist.hxx
View file

@ -89,7 +89,6 @@ namespace accessibility
virtual sal_Int32 SAL_CALL getBackground( ) override;
// XAccessibleExtendedComponent
virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont( ) override;
virtual OUString SAL_CALL getTitledBorderText( ) override;
virtual OUString SAL_CALL getToolTipText( ) override;

6
accessibility/inc/pch/precompiled_acc.hxx
View file

@ -90,6 +90,7 @@
#include <vcl/NotebookbarContextControl.hxx>
#include <vcl/Scanline.hxx>
#include <vcl/WindowPosSize.hxx>
#include <vcl/accessibility/characterattributeshelper.hxx>
#include <vcl/accessibletable.hxx>
#include <vcl/accessibletableprovider.hxx>
#include <vcl/alpha.hxx>
@ -290,7 +291,6 @@
#include <extended/AccessibleGridControlTableCell.hxx>
#include <extended/accessiblebrowseboxcell.hxx>
#include <helper/accresmgr.hxx>
#include <helper/characterattributeshelper.hxx>
#include <i18nlangtag/lang.h>
#include <i18nlangtag/languagetag.hxx>
#include <o3tl/cow_wrapper.hxx>
@ -305,8 +305,6 @@
#include <sot/exchange.hxx>
#include <sot/formats.hxx>
#include <sot/sotdllapi.h>
#include <standard/accessiblemenubasecomponent.hxx>
#include <standard/accessiblemenuitemcomponent.hxx>
#include <standard/vclxaccessiblebox.hxx>
#include <standard/vclxaccessibletextcomponent.hxx>
#include <svl/SfxBroadcaster.hxx>
@ -342,7 +340,7 @@
#include <unotools/unotoolsdllapi.h>
#endif // PCH_LEVEL >= 3
#if PCH_LEVEL >= 4
#include <strings.hxx>
#include <vcl/accessibility/strings.hxx>
#endif // PCH_LEVEL >= 4
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

1
accessibility/inc/standard/vclxaccessibleheaderbaritem.hxx
View file

@ -79,7 +79,6 @@ public:
virtual sal_Int32 SAL_CALL getBackground() override;
// XAccessibleExtendedComponent
virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont( ) override;
virtual OUString SAL_CALL getTitledBorderText( ) override;
virtual OUString SAL_CALL getToolTipText( ) override;
};

1
accessibility/inc/standard/vclxaccessiblestatusbaritem.hxx
View file

@ -92,7 +92,6 @@ public:
virtual sal_Int32 SAL_CALL getBackground( ) override;
// XAccessibleExtendedComponent
virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont( ) override;
virtual OUString SAL_CALL getTitledBorderText( ) override;
virtual OUString SAL_CALL getToolTipText( ) override;

1
accessibility/inc/standard/vclxaccessibletabpage.hxx
View file

@ -102,7 +102,6 @@ public:
virtual sal_Int32 SAL_CALL getBackground( ) override;
// XAccessibleExtendedComponent
virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont( ) override;
virtual OUString SAL_CALL getTitledBorderText( ) override;
virtual OUString SAL_CALL getToolTipText( ) override;

1
accessibility/inc/standard/vclxaccessibletoolboxitem.hxx
View file

@ -127,7 +127,6 @@ public:
virtual sal_Int32 SAL_CALL getBackground( ) override;
// XAccessibleExtendedComponent
virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont( ) override;
virtual OUString SAL_CALL getTitledBorderText( ) override;
virtual OUString SAL_CALL getToolTipText( ) override;

9
accessibility/source/extended/AccessibleBrowseBox.cxx
View file

@ -22,8 +22,9 @@
#include <extended/AccessibleBrowseBoxHeaderBar.hxx>
#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
#include <utility>
#include <vcl/accessibletableprovider.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <vcl/accessibletableprovider.hxx>
#include <vcl/unohelp.hxx>
#include <sal/types.h>
@ -135,12 +136,12 @@ AccessibleBrowseBox::getAccessibleAtPoint( const awt::Point& rPoint )
ensureIsAlive();
sal_Int32 nIndex = 0;
if (mpBrowseBox->ConvertPointToControlIndex(nIndex, VCLUnoHelper::ConvertToVCLPoint(rPoint)))
if (mpBrowseBox->ConvertPointToControlIndex(nIndex, vcl::unohelper::ConvertToVCLPoint(rPoint)))
return mpBrowseBox->CreateAccessibleControl(nIndex);
// try whether point is in one of the fixed children
// (table, header bars, corner control)
Point aPoint(VCLUnoHelper::ConvertToVCLPoint(rPoint));
Point aPoint(vcl::unohelper::ConvertToVCLPoint(rPoint));
for (nIndex = 0; nIndex < vcl::BBINDEX_FIRSTCONTROL; ++nIndex)
{
css::uno::Reference< css::accessibility::XAccessible > xCurrChild(implGetFixedChild(nIndex));
@ -148,7 +149,7 @@ AccessibleBrowseBox::getAccessibleAtPoint( const awt::Point& rPoint )
xCurrChildComp( xCurrChild, uno::UNO_QUERY );
if (xCurrChildComp.is()
&& VCLUnoHelper::ConvertToVCLRect(xCurrChildComp->getBounds()).Contains(aPoint))
&& vcl::unohelper::ConvertToVCLRect(xCurrChildComp->getBounds()).Contains(aPoint))
return xCurrChild;
}
return nullptr;

14
accessibility/source/extended/AccessibleBrowseBoxBase.cxx
View file

@ -26,8 +26,8 @@
#include <com/sun/star/accessibility/AccessibleRole.hpp>
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
#include <com/sun/star/accessibility/IllegalAccessibleComponentStateException.hpp>
#include <toolkit/helper/vclunohelper.hxx>
#include <unotools/accessiblerelationsethelper.hxx>
#include <vcl/unohelp.hxx>
#include <vcl/window.hxx>
#include <vcl/svapp.hxx>
#include <sal/log.hxx>
@ -211,27 +211,27 @@ lang::Locale SAL_CALL AccessibleBrowseBoxBase::getLocale()
sal_Bool SAL_CALL AccessibleBrowseBoxBase::containsPoint( const css::awt::Point& rPoint )
{
return tools::Rectangle(Point(), getBoundingBox().GetSize())
.Contains(VCLUnoHelper::ConvertToVCLPoint(rPoint));
.Contains(vcl::unohelper::ConvertToVCLPoint(rPoint));
}
awt::Rectangle SAL_CALL AccessibleBrowseBoxBase::getBounds()
{
return VCLUnoHelper::ConvertToAWTRect(getBoundingBox());
return vcl::unohelper::ConvertToAWTRect(getBoundingBox());
}
awt::Point SAL_CALL AccessibleBrowseBoxBase::getLocation()
{
return VCLUnoHelper::ConvertToAWTPoint(getBoundingBox().TopLeft());
return vcl::unohelper::ConvertToAWTPoint(getBoundingBox().TopLeft());
}
awt::Point SAL_CALL AccessibleBrowseBoxBase::getLocationOnScreen()
{
return VCLUnoHelper::ConvertToAWTPoint(getBoundingBoxOnScreen().TopLeft());
return vcl::unohelper::ConvertToAWTPoint(getBoundingBoxOnScreen().TopLeft());
}
awt::Size SAL_CALL AccessibleBrowseBoxBase::getSize()
{
return VCLUnoHelper::ConvertToAWTSize(getBoundingBox().GetSize());
return vcl::unohelper::ConvertToAWTSize(getBoundingBox().GetSize());
}
void SAL_CALL AccessibleBrowseBoxBase::focusGained( const css::awt::FocusEvent& )
@ -351,7 +351,7 @@ bool AccessibleBrowseBoxBase::implIsShowing()
xParentComp( mxParent->getAccessibleContext(), uno::UNO_QUERY );
if( xParentComp.is() )
bShowing = implGetBoundingBox().Overlaps(
VCLUnoHelper::ConvertToVCLRect(xParentComp->getBounds()));
vcl::unohelper::ConvertToVCLRect(xParentComp->getBounds()));
}
return bShowing;
}

6
accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx
View file

@ -18,8 +18,8 @@
*/
#include <extended/AccessibleBrowseBoxHeaderBar.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <vcl/accessibletableprovider.hxx>
#include <vcl/unohelp.hxx>
#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
using ::com::sun::star::uno::Reference;
@ -78,9 +78,9 @@ AccessibleBrowseBoxHeaderBar::getAccessibleAtPoint( const awt::Point& rPoint )
sal_uInt16 nColumnPos = 0;
bool bConverted
= isRowBar()
? mpBrowseBox->ConvertPointToRowHeader(nRow, VCLUnoHelper::ConvertToVCLPoint(rPoint))
? mpBrowseBox->ConvertPointToRowHeader(nRow, vcl::unohelper::ConvertToVCLPoint(rPoint))
: mpBrowseBox->ConvertPointToColumnHeader(nColumnPos,
VCLUnoHelper::ConvertToVCLPoint(rPoint));
vcl::unohelper::ConvertToVCLPoint(rPoint));
return bConverted ? implGetChild( nRow, nColumnPos ) : Reference< XAccessible >();
}

4
accessibility/source/extended/AccessibleBrowseBoxTable.cxx
View file

@ -18,8 +18,8 @@
*/
#include <extended/AccessibleBrowseBoxTable.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <vcl/accessibletableprovider.hxx>
#include <vcl/unohelp.hxx>
#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
@ -78,7 +78,7 @@ AccessibleBrowseBoxTable::getAccessibleAtPoint( const awt::Point& rPoint )
sal_Int32 nRow = 0;
sal_uInt16 nColumnPos = 0;
if (mpBrowseBox->ConvertPointToCellAddress(nRow, nColumnPos,
VCLUnoHelper::ConvertToVCLPoint(rPoint)))
vcl::unohelper::ConvertToVCLPoint(rPoint)))
xChild = mpBrowseBox->CreateAccessibleCell( nRow, nColumnPos );
return xChild;

6
accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx
View file

@ -20,8 +20,8 @@
#include <extended/AccessibleBrowseBoxTableCell.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <vcl/accessibletableprovider.hxx>
#include <vcl/unohelp.hxx>
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
@ -118,7 +118,7 @@ namespace accessibility
if ( !implIsValidIndex( nIndex, implGetText().getLength() ) )
throw IndexOutOfBoundsException();
aRect = VCLUnoHelper::ConvertToAWTRect(
aRect = vcl::unohelper::ConvertToAWTRect(
mpBrowseBox->GetFieldCharacterBounds(getRowPos(), getColumnPos(), nIndex));
}
@ -133,7 +133,7 @@ namespace accessibility
ensureIsAlive();
return mpBrowseBox->GetFieldIndexAtPoint(getRowPos(), getColumnPos(),
VCLUnoHelper::ConvertToVCLPoint(_aPoint));
vcl::unohelper::ConvertToVCLPoint(_aPoint));
}
/** @return

8
accessibility/source/extended/AccessibleGridControl.cxx
View file

@ -23,10 +23,10 @@
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
#include <com/sun/star/accessibility/AccessibleRole.hpp>
#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
#include <toolkit/helper/vclunohelper.hxx>
#include <utility>
#include <vcl/accessibletable.hxx>
#include <vcl/svapp.hxx>
#include <vcl/unohelp.hxx>
namespace accessibility
{
@ -147,13 +147,13 @@ AccessibleGridControl::getAccessibleAtPoint( const awt::Point& rPoint )
ensureIsAlive();
sal_Int32 nIndex = 0;
if (m_aTable.ConvertPointToControlIndex(nIndex, VCLUnoHelper::ConvertToVCLPoint(rPoint)))
if (m_aTable.ConvertPointToControlIndex(nIndex, vcl::unohelper::ConvertToVCLPoint(rPoint)))
return m_aTable.CreateAccessibleControl(nIndex);
else
{
// try whether point is in one of the fixed children
// (table, header bars, corner control)
Point aPoint(VCLUnoHelper::ConvertToVCLPoint(rPoint));
Point aPoint(vcl::unohelper::ConvertToVCLPoint(rPoint));
for (nIndex = 0; nIndex < 3; ++nIndex)
{
css::uno::Reference< css::accessibility::XAccessible > xCurrChild( implGetFixedChild( nIndex ) );
@ -161,7 +161,7 @@ AccessibleGridControl::getAccessibleAtPoint( const awt::Point& rPoint )
xCurrChildComp( xCurrChild, uno::UNO_QUERY );
if (xCurrChildComp.is()
&& VCLUnoHelper::ConvertToVCLRect(xCurrChildComp->getBounds()).Contains(aPoint))
&& vcl::unohelper::ConvertToVCLRect(xCurrChildComp->getBounds()).Contains(aPoint))
return xCurrChild;
}
}

14
accessibility/source/extended/AccessibleGridControlBase.cxx
View file

@ -18,10 +18,10 @@
*/
#include <extended/AccessibleGridControlBase.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <utility>
#include <vcl/accessibletable.hxx>
#include <vcl/svapp.hxx>
#include <vcl/unohelp.hxx>
#include <vcl/window.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <sal/types.h>
@ -184,27 +184,27 @@ lang::Locale SAL_CALL AccessibleGridControlBase::getLocale()
sal_Bool SAL_CALL AccessibleGridControlBase::containsPoint( const awt::Point& rPoint )
{
return tools::Rectangle(Point(), getBoundingBox().GetSize())
.Contains(VCLUnoHelper::ConvertToVCLPoint(rPoint));
.Contains(vcl::unohelper::ConvertToVCLPoint(rPoint));
}
awt::Rectangle SAL_CALL AccessibleGridControlBase::getBounds()
{
return VCLUnoHelper::ConvertToAWTRect(getBoundingBox());
return vcl::unohelper::ConvertToAWTRect(getBoundingBox());
}
awt::Point SAL_CALL AccessibleGridControlBase::getLocation()
{
return VCLUnoHelper::ConvertToAWTPoint(getBoundingBox().TopLeft());
return vcl::unohelper::ConvertToAWTPoint(getBoundingBox().TopLeft());
}
awt::Point SAL_CALL AccessibleGridControlBase::getLocationOnScreen()
{
return VCLUnoHelper::ConvertToAWTPoint(getBoundingBoxOnScreen().TopLeft());
return vcl::unohelper::ConvertToAWTPoint(getBoundingBoxOnScreen().TopLeft());
}
awt::Size SAL_CALL AccessibleGridControlBase::getSize()
{
return VCLUnoHelper::ConvertToAWTSize(getBoundingBox().GetSize());
return vcl::unohelper::ConvertToAWTSize(getBoundingBox().GetSize());
}
// css::accessibility::XAccessibleEventBroadcaster
@ -274,7 +274,7 @@ bool AccessibleGridControlBase::implIsShowing()
xParentComp( m_xParent->getAccessibleContext(), uno::UNO_QUERY );
if( xParentComp.is() )
bShowing = implGetBoundingBox().Overlaps(
VCLUnoHelper::ConvertToVCLRect(xParentComp->getBounds()));
vcl::unohelper::ConvertToVCLRect(xParentComp->getBounds()));
}
return bShowing;
}

3
accessibility/source/extended/AccessibleGridControlHeader.cxx
View file

@ -23,6 +23,7 @@
#include <toolkit/helper/vclunohelper.hxx>
#include <vcl/accessibletable.hxx>
#include <vcl/svapp.hxx>
#include <vcl/unohelp.hxx>
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
@ -97,7 +98,7 @@ AccessibleGridControlHeader::getAccessibleAtPoint( const awt::Point& rPoint )
sal_Int32 nRow = 0;
sal_Int32 nColumnPos = 0;
bool bConverted = m_aTable.ConvertPointToCellAddress(nRow, nColumnPos,
VCLUnoHelper::ConvertToVCLPoint(rPoint));
vcl::unohelper::ConvertToVCLPoint(rPoint));
return bConverted ? implGetChild( nRow, nColumnPos ) : Reference< XAccessible >();
}

4
accessibility/source/extended/AccessibleGridControlTable.cxx
View file

@ -23,9 +23,9 @@
#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
#include <extended/AccessibleGridControlTable.hxx>
#include <extended/AccessibleGridControlTableCell.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <vcl/accessibletable.hxx>
#include <vcl/svapp.hxx>
#include <vcl/unohelp.hxx>
#include <tools/debug.hxx>
using ::com::sun::star::uno::Reference;
@ -96,7 +96,7 @@ AccessibleGridControlTable::getAccessibleAtPoint( const awt::Point& rPoint )
sal_Int32 nRow = 0;
sal_Int32 nColumnPos = 0;
if (m_aTable.ConvertPointToCellAddress(nRow, nColumnPos,
VCLUnoHelper::ConvertToVCLPoint(rPoint)))
vcl::unohelper::ConvertToVCLPoint(rPoint)))
xChild = new AccessibleGridControlTableCell(this, m_aTable, nRow, nColumnPos);
return xChild;
}

6
accessibility/source/extended/AccessibleGridControlTableCell.cxx
View file

@ -20,7 +20,7 @@
#include <extended/AccessibleGridControlTableCell.hxx>
#include <vcl/accessibletable.hxx>
#include <vcl/svapp.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <vcl/unohelp.hxx>
#include <tools/gen.hxx>
#include <tools/debug.hxx>
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
@ -138,7 +138,7 @@ namespace accessibility
if ( !implIsValidIndex( nIndex, implGetText().getLength() ) )
throw IndexOutOfBoundsException();
return VCLUnoHelper::ConvertToAWTRect(
return vcl::unohelper::ConvertToAWTRect(
m_aTable.GetFieldCharacterBounds(getRowPos(), getColumnPos(), nIndex));
}
@ -149,7 +149,7 @@ namespace accessibility
ensureIsAlive();
return m_aTable.GetFieldIndexAtPoint(getRowPos(), getColumnPos(),
VCLUnoHelper::ConvertToVCLPoint(_aPoint));
vcl::unohelper::ConvertToVCLPoint(_aPoint));
}
/** @return

4
accessibility/source/extended/AccessibleIconView.cxx
View file

@ -11,8 +11,8 @@
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
#include <toolkit/helper/vclunohelper.hxx>
#include <vcl/event.hxx>
#include <vcl/unohelp.hxx>
#include <extended/AccessibleIconView.hxx>
@ -36,7 +36,7 @@ void AccessibleIconView::ProcessWindowEvent(const VclWindowEvent& rVclWindowEven
if (MouseEvent* pMouseEvt = static_cast<MouseEvent*>(rVclWindowEvent.GetData()))
{
if (auto xChild = getAccessibleAtPoint(
VCLUnoHelper::ConvertToAWTPoint(pMouseEvt->GetPosPixel())))
vcl::unohelper::ConvertToAWTPoint(pMouseEvt->GetPosPixel())))
{
// Allow announcing the element on mouse hover
css::uno::Any aNew(xChild);

12
accessibility/source/extended/accessibleiconchoicectrlentry.cxx
View file

@ -25,7 +25,7 @@
#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <vcl/unohelp.hxx>
#include <unotools/accessiblerelationsethelper.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <svtools/stringtransfer.hxx>
@ -129,7 +129,7 @@ namespace accessibility
Reference< XAccessibleComponent > xParentComp( xParentContext, uno::UNO_QUERY );
if( xParentComp.is() )
bShowing = GetBoundingBox_Impl().Overlaps(
VCLUnoHelper::ConvertToVCLRect(xParentComp->getBounds()));
vcl::unohelper::ConvertToVCLRect(xParentComp->getBounds()));
}
return bShowing;
@ -152,7 +152,7 @@ namespace accessibility
css::awt::Rectangle AccessibleIconChoiceCtrlEntry::implGetBounds()
{
return VCLUnoHelper::ConvertToAWTRect(GetBoundingBox_Impl());
return vcl::unohelper::ConvertToAWTRect(GetBoundingBox_Impl());
}
OUString AccessibleIconChoiceCtrlEntry::implGetText()
@ -324,7 +324,7 @@ namespace accessibility
awt::Point SAL_CALL AccessibleIconChoiceCtrlEntry::getLocationOnScreen( )
{
return VCLUnoHelper::ConvertToAWTPoint( GetBoundingBoxOnScreen().TopLeft() );
return vcl::unohelper::ConvertToAWTPoint( GetBoundingBoxOnScreen().TopLeft() );
}
void SAL_CALL AccessibleIconChoiceCtrlEntry::grabFocus( )
@ -383,7 +383,7 @@ namespace accessibility
tools::Rectangle aItemRect = GetBoundingBox_Impl();
tools::Rectangle aCharRect = m_pIconCtrl->GetEntryCharacterBounds( m_nIndex, _nIndex );
aCharRect.Move( -aItemRect.Left(), -aItemRect.Top() );
aBounds = VCLUnoHelper::ConvertToAWTRect(aCharRect);
aBounds = vcl::unohelper::ConvertToAWTRect(aCharRect);
}
return aBounds;
@ -400,7 +400,7 @@ namespace accessibility
vcl::ControlLayoutData aLayoutData;
tools::Rectangle aItemRect = GetBoundingBox_Impl();
m_pIconCtrl->RecordLayoutData( &aLayoutData, aItemRect );
Point aPnt(VCLUnoHelper::ConvertToVCLPoint(aPoint));
Point aPnt(vcl::unohelper::ConvertToVCLPoint(aPoint));
aPnt += aItemRect.TopLeft();
nIndex = aLayoutData.GetIndexForPoint( aPnt );

22
accessibility/source/extended/accessiblelistboxentry.cxx
View file

@ -31,7 +31,7 @@
#include <i18nlangtag/languagetag.hxx>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <vcl/unohelp.hxx>
#include <unotools/accessiblerelationsethelper.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <comphelper/accessibleeventnotifier.hxx>
@ -177,7 +177,7 @@ namespace accessibility
Reference< XAccessibleComponent > xParentComp( xParentContext, uno::UNO_QUERY );
if( xParentComp.is() )
bShowing = GetBoundingBox_Impl().Overlaps(
VCLUnoHelper::ConvertToVCLRect(xParentComp->getBounds()));
vcl::unohelper::ConvertToVCLRect(xParentComp->getBounds()));
}
return bShowing;
@ -522,7 +522,7 @@ namespace accessibility
sal_Bool SAL_CALL AccessibleListBoxEntry::containsPoint( const awt::Point& rPoint )
{
return tools::Rectangle(Point(), GetBoundingBox().GetSize())
.Contains(VCLUnoHelper::ConvertToVCLPoint(rPoint));
.Contains(vcl::unohelper::ConvertToVCLPoint(rPoint));
}
Reference< XAccessible > SAL_CALL AccessibleListBoxEntry::getAccessibleAtPoint( const awt::Point& _aPoint )
@ -532,7 +532,7 @@ namespace accessibility
EnsureIsAlive();
SvTreeListEntry* pEntry
= m_pTreeListBox->GetEntry(VCLUnoHelper::ConvertToVCLPoint(_aPoint));
= m_pTreeListBox->GetEntry(vcl::unohelper::ConvertToVCLPoint(_aPoint));
if ( !pEntry )
throw RuntimeException(u"AccessibleListBoxEntry::getAccessibleAtPoint - pEntry cannot be empty!"_ustr);
@ -541,29 +541,29 @@ namespace accessibility
assert(xListBox.is());
auto pAccEntry = xListBox->implGetAccessible(*pEntry);
tools::Rectangle aRect = pAccEntry->GetBoundingBox_Impl();
if (aRect.Contains(VCLUnoHelper::ConvertToVCLPoint(_aPoint)))
if (aRect.Contains(vcl::unohelper::ConvertToVCLPoint(_aPoint)))
xAcc = pAccEntry.get();
return xAcc;
}
awt::Rectangle SAL_CALL AccessibleListBoxEntry::getBounds( )
{
return VCLUnoHelper::ConvertToAWTRect(GetBoundingBox());
return vcl::unohelper::ConvertToAWTRect(GetBoundingBox());
}
awt::Point SAL_CALL AccessibleListBoxEntry::getLocation( )
{
return VCLUnoHelper::ConvertToAWTPoint(GetBoundingBox().TopLeft());
return vcl::unohelper::ConvertToAWTPoint(GetBoundingBox().TopLeft());
}
awt::Point SAL_CALL AccessibleListBoxEntry::getLocationOnScreen( )
{
return VCLUnoHelper::ConvertToAWTPoint(GetBoundingBoxOnScreen().TopLeft());
return vcl::unohelper::ConvertToAWTPoint(GetBoundingBoxOnScreen().TopLeft());
}
awt::Size SAL_CALL AccessibleListBoxEntry::getSize( )
{
return VCLUnoHelper::ConvertToAWTSize(GetBoundingBox().GetSize());
return vcl::unohelper::ConvertToAWTSize(GetBoundingBox().GetSize());
}
void SAL_CALL AccessibleListBoxEntry::grabFocus( )
@ -627,7 +627,7 @@ namespace accessibility
m_pTreeListBox->RecordLayoutData( &aLayoutData, aItemRect );
tools::Rectangle aCharRect = aLayoutData.GetCharacterBounds( nIndex );
aCharRect.Move( -aItemRect.Left(), -aItemRect.Top() );
aBounds = VCLUnoHelper::ConvertToAWTRect(aCharRect);
aBounds = vcl::unohelper::ConvertToAWTRect(aCharRect);
}
return aBounds;
@ -647,7 +647,7 @@ namespace accessibility
vcl::ControlLayoutData aLayoutData;
tools::Rectangle aItemRect = GetBoundingBox();
m_pTreeListBox->RecordLayoutData( &aLayoutData, aItemRect );
Point aPnt(VCLUnoHelper::ConvertToVCLPoint(aPoint));
Point aPnt(vcl::unohelper::ConvertToVCLPoint(aPoint));
aPnt += aItemRect.TopLeft();
nIndex = aLayoutData.GetIndexForPoint( aPnt );
}

35
accessibility/source/extended/accessibletabbar.cxx
View file

@ -33,8 +33,7 @@
#include <o3tl/safeint.hxx>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
#include <toolkit/awt/vclxfont.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <vcl/unohelp.hxx>
namespace accessibility
{
@ -145,7 +144,7 @@ namespace accessibility
{
awt::Rectangle aBounds;
if ( m_pTabBar )
aBounds = VCLUnoHelper::ConvertToAWTRect(
aBounds = vcl::unohelper::ConvertToAWTRect(
tools::Rectangle(m_pTabBar->GetPosPixel(), m_pTabBar->GetSizePixel()));
return aBounds;
@ -362,8 +361,8 @@ namespace accessibility
Reference< XAccessibleComponent > xComp( xAcc->getAccessibleContext(), UNO_QUERY );
if ( xComp.is() )
{
tools::Rectangle aRect = VCLUnoHelper::ConvertToVCLRect(xComp->getBounds());
Point aPos = VCLUnoHelper::ConvertToVCLPoint(rPoint);
tools::Rectangle aRect = vcl::unohelper::ConvertToVCLRect(xComp->getBounds());
Point aPos = vcl::unohelper::ConvertToVCLPoint(rPoint);
if ( aRect.Contains( aPos ) )
{
return xAcc;
@ -427,32 +426,6 @@ namespace accessibility
// XAccessibleExtendedComponent
Reference< awt::XFont > AccessibleTabBar::getFont( )
{
OExternalLockGuard aGuard( this );
Reference< awt::XFont > xFont;
if ( m_pTabBar )
{
Reference< awt::XDevice > xDev( m_pTabBar->GetComponentInterface(), UNO_QUERY );
if ( xDev.is() )
{
vcl::Font aFont;
if ( m_pTabBar->IsControlFont() )
aFont = m_pTabBar->GetControlFont();
else
aFont = m_pTabBar->GetFont();
rtl::Reference<VCLXFont> pVCLXFont = new VCLXFont;
pVCLXFont->Init( *xDev, aFont );
xFont = pVCLXFont;
}
}
return xFont;
}
OUString AccessibleTabBar::getTitledBorderText( )
{
OExternalLockGuard aGuard( this );

22
accessibility/source/extended/accessibletabbarpage.cxx
View file

@ -28,7 +28,7 @@
#include <unotools/accessiblerelationsethelper.hxx>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <vcl/unohelp.hxx>
#include <i18nlangtag/languagetag.hxx>
@ -164,7 +164,7 @@ namespace accessibility
if ( m_pTabBar )
{
// get bounding rectangle relative to the AccessibleTabBar
aBounds = VCLUnoHelper::ConvertToAWTRect(m_pTabBar->GetPageRect(m_nPageId));
aBounds = vcl::unohelper::ConvertToAWTRect(m_pTabBar->GetPageRect(m_nPageId));
// get position of the AccessibleTabBarPageList relative to the AccessibleTabBar
Reference< XAccessible > xParent = getAccessibleParent();
@ -371,24 +371,6 @@ namespace accessibility
// XAccessibleExtendedComponent
Reference< awt::XFont > AccessibleTabBarPage::getFont( )
{
OExternalLockGuard aGuard( this );
Reference< awt::XFont > xFont;
Reference< XAccessible > xParent = getAccessibleParent();
if ( xParent.is() )
{
Reference< XAccessibleExtendedComponent > xParentComp( xParent->getAccessibleContext(), UNO_QUERY );
if ( xParentComp.is() )
xFont = xParentComp->getFont();
}
return xFont;
}
OUString AccessibleTabBarPage::getTitledBorderText( )
{
OExternalLockGuard aGuard( this );

26
accessibility/source/extended/accessibletabbarpagelist.cxx
View file

@ -29,7 +29,7 @@
#include <unotools/accessiblerelationsethelper.hxx>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <vcl/unohelp.hxx>
#include <i18nlangtag/languagetag.hxx>
@ -306,7 +306,7 @@ namespace accessibility
{
awt::Rectangle aBounds;
if ( m_pTabBar )
aBounds = VCLUnoHelper::ConvertToAWTRect(m_pTabBar->GetPageArea());
aBounds = vcl::unohelper::ConvertToAWTRect(m_pTabBar->GetPageArea());
return aBounds;
}
@ -491,8 +491,8 @@ namespace accessibility
Reference< XAccessibleComponent > xComp( xAcc->getAccessibleContext(), UNO_QUERY );
if ( xComp.is() )
{
tools::Rectangle aRect = VCLUnoHelper::ConvertToVCLRect(xComp->getBounds());
Point aPos = VCLUnoHelper::ConvertToVCLPoint(rPoint);
tools::Rectangle aRect = vcl::unohelper::ConvertToVCLRect(xComp->getBounds());
Point aPos = vcl::unohelper::ConvertToVCLPoint(rPoint);
if ( aRect.Contains( aPos ) )
{
xChild = xAcc;
@ -548,24 +548,6 @@ namespace accessibility
// XAccessibleExtendedComponent
Reference< awt::XFont > AccessibleTabBarPageList::getFont( )
{
OExternalLockGuard aGuard( this );
Reference< awt::XFont > xFont;
Reference< XAccessible > xParent = getAccessibleParent();
if ( xParent.is() )
{
Reference< XAccessibleExtendedComponent > xParentComp( xParent->getAccessibleContext(), UNO_QUERY );
if ( xParentComp.is() )
xFont = xParentComp->getFont();
}
return xFont;
}
OUString AccessibleTabBarPageList::getTitledBorderText( )
{
return OUString();

4
accessibility/source/extended/textwindowaccessibility.cxx
View file

@ -37,9 +37,9 @@
#include <utility>
#include <vcl/svapp.hxx>
#include <vcl/txtattr.hxx>
#include <vcl/unohelp.hxx>
#include <vcl/window.hxx>
#include <comphelper/diagnose_ex.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <comphelper/sequence.hxx>
#include <algorithm>
@ -876,7 +876,7 @@ Document::retrieveCharacterBounds(Paragraph const * pParagraph,
if ( nIndex == nLength )
{
aBounds
= VCLUnoHelper::ConvertToAWTRect(m_rEngine.PaMtoEditCursor(::TextPaM(nNumber, nIndex)));
= vcl::unohelper::ConvertToAWTRect(m_rEngine.PaMtoEditCursor(::TextPaM(nNumber, nIndex)));
}
else
{

15
accessibility/source/helper/acc_factory.cxx
View file

@ -42,8 +42,6 @@
#include <standard/vclxaccessiblestatusbar.hxx>
#include <standard/vclxaccessibletabcontrol.hxx>
#include <standard/vclxaccessibletabpagewindow.hxx>
#include <standard/vclxaccessiblemenubar.hxx>
#include <standard/vclxaccessiblepopupmenu.hxx>
#include <extended/accessibletablistbox.hxx>
#include <extended/AccessibleBrowseBox.hxx>
#include <extended/accessibleiconchoicectrl.hxx>
@ -115,8 +113,6 @@ public:
createAccessibleContext( SVTXNumericField* _pXWindow ) override;
virtual css::uno::Reference< css::accessibility::XAccessibleContext >
createAccessibleContext( VCLXWindow* _pXWindow ) override;
virtual css::uno::Reference< css::accessibility::XAccessible >
createAccessible( Menu* _pMenu, bool _bIsMenuBar ) override;
// ::vcl::IAccessibleFactory
virtual vcl::IAccessibleTabListBox*
@ -224,17 +220,6 @@ AccessibleFactory::~AccessibleFactory()
{
}
Reference< XAccessible > AccessibleFactory::createAccessible( Menu* _pMenu, bool _bIsMenuBar )
{
rtl::Reference<OAccessibleMenuBaseComponent> pAccessible;
if ( _bIsMenuBar )
pAccessible = new VCLXAccessibleMenuBar( _pMenu );
else
pAccessible = new VCLXAccessiblePopupMenu( _pMenu );
pAccessible->SetStates();
return pAccessible;
}
Reference< XAccessibleContext > AccessibleFactory::createAccessibleContext( VCLXButton* _pXWindow )
{
return new VCLXAccessibleButton( _pXWindow );

22
accessibility/source/standard/svtaccessiblenumericfield.cxx
View file

@ -19,7 +19,7 @@
#include <standard/svtaccessiblenumericfield.hxx>
#include <comphelper/accessiblecontexthelper.hxx>
#include <toolkit/awt/vclxwindows.hxx>
#include <vcl/toolkit/fmtfield.hxx>
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
#include <com/sun/star/accessibility/AccessibleRole.hpp>
@ -50,9 +50,9 @@ css::uno::Any SAL_CALL SVTXAccessibleNumericField::getCurrentValue()
OExternalLockGuard aGuard(this);
double dValue = 0;
SVTXNumericField* pField = static_cast<SVTXNumericField*>(GetVCLXWindow());
VclPtr<FormattedField> pField = GetAs<FormattedField>();
if (pField)
dValue = pField->getValue();
dValue = pField->GetFormatter().GetValue();
return css::uno::Any(dValue);
}
@ -61,13 +61,13 @@ sal_Bool SVTXAccessibleNumericField::setCurrentValue(const css::uno::Any& aNumbe
{
OExternalLockGuard aGuard(this);
SVTXNumericField* pField = static_cast<SVTXNumericField*>(GetVCLXWindow());
VclPtr<FormattedField> pField = GetAs<FormattedField>();
if (!pField)
return false;
double dValue = 0;
aNumber >>= dValue;
pField->setValue(dValue);
pField->GetFormatter().SetValue(dValue);
return true;
}
@ -76,9 +76,9 @@ css::uno::Any SAL_CALL SVTXAccessibleNumericField::getMaximumValue()
OExternalLockGuard aGuard(this);
double dValue = 0;
SVTXNumericField* pField = static_cast<SVTXNumericField*>(GetVCLXWindow());
VclPtr<FormattedField> pField = GetAs<FormattedField>();
if (pField)
dValue = pField->getMax();
dValue = pField->GetFormatter().GetMaxValue();
return css::uno::Any(dValue);
}
@ -88,9 +88,9 @@ css::uno::Any SAL_CALL SVTXAccessibleNumericField::getMinimumValue()
OExternalLockGuard aGuard(this);
double dValue = 0;
SVTXNumericField* pField = static_cast<SVTXNumericField*>(GetVCLXWindow());
VclPtr<FormattedField> pField = GetAs<FormattedField>();
if (pField)
dValue = pField->getMin();
dValue = pField->GetFormatter().GetMinValue();
return css::uno::Any(dValue);
}
@ -100,9 +100,9 @@ css::uno::Any SAL_CALL SVTXAccessibleNumericField::getMinimumIncrement()
OExternalLockGuard aGuard(this);
double dValue = 0;
SVTXNumericField* pField = static_cast<SVTXNumericField*>(GetVCLXWindow());
VclPtr<FormattedField> pField = GetAs<FormattedField>();
if (pField)
dValue = pField->getSpinSize();
dValue = pField->GetFormatter().GetSpinSize();
return css::uno::Any(dValue);
}

3
accessibility/source/standard/vclxaccessiblebox.cxx
View file

@ -26,10 +26,11 @@
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
#include <com/sun/star/accessibility/AccessibleRole.hpp>
#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
#include <vcl/accessibility/strings.hxx>
#include <vcl/svapp.hxx>
#include <vcl/toolkit/combobox.hxx>
#include <vcl/toolkit/lstbox.hxx>
#include <strings.hxx>
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;

2
accessibility/source/standard/vclxaccessiblebutton.cxx
View file

@ -27,8 +27,8 @@
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
#include <strings.hxx>
#include <vcl/accessibility/strings.hxx>
#include <vcl/toolkit/button.hxx>
#include <vcl/event.hxx>
#include <vcl/vclevent.hxx>

40
accessibility/source/standard/vclxaccessiblecheckbox.cxx
View file

@ -19,7 +19,6 @@
#include <standard/vclxaccessiblecheckbox.hxx>
#include <toolkit/awt/vclxwindows.hxx>
#include <helper/accresmgr.hxx>
#include <strings.hrc>
@ -54,25 +53,15 @@ VCLXAccessibleCheckBox::VCLXAccessibleCheckBox( VCLXWindow* pVCLWindow )
bool VCLXAccessibleCheckBox::IsChecked() const
{
bool bChecked = false;
VCLXCheckBox* pVCLXCheckBox = static_cast< VCLXCheckBox* >( GetVCLXWindow() );
if ( pVCLXCheckBox && pVCLXCheckBox->getState() == sal_Int16(1) )
bChecked = true;
return bChecked;
VclPtr<CheckBox> pCheckBox = GetAs<CheckBox>();
return pCheckBox && pCheckBox->IsChecked();
}
bool VCLXAccessibleCheckBox::IsIndeterminate() const
{
bool bIndeterminate = false;
VCLXCheckBox* pVCLXCheckBox = static_cast< VCLXCheckBox* >( GetVCLXWindow() );
if ( pVCLXCheckBox && pVCLXCheckBox->getState() == sal_Int16(2) )
bIndeterminate = true;
return bIndeterminate;
VclPtr<CheckBox> pCheckBox = GetAs<CheckBox>();
return pCheckBox && pCheckBox->GetState() == TRISTATE_INDET;
}
@ -176,23 +165,22 @@ sal_Bool VCLXAccessibleCheckBox::doAccessibleAction ( sal_Int32 nIndex )
if ( nIndex != 0 )
throw IndexOutOfBoundsException();
VclPtr< CheckBox > pCheckBox = GetAs< CheckBox >();
VCLXCheckBox* pVCLXCheckBox = static_cast< VCLXCheckBox* >( GetVCLXWindow() );
if ( pCheckBox && pVCLXCheckBox )
VclPtr<CheckBox> pCheckBox = GetAs<CheckBox>();
if (pCheckBox)
{
sal_Int32 nValueMax = sal_Int32(1);
if ( pCheckBox->IsTriStateEnabled() )
nValueMax = sal_Int32(2);
sal_Int32 nValue = static_cast<sal_Int32>(pVCLXCheckBox->getState());
sal_Int32 nValue = static_cast<sal_Int32>(pCheckBox->GetState());
++nValue;
if ( nValue > nValueMax )
nValue = 0;
pVCLXCheckBox->setState( static_cast<sal_Int16>(nValue) );
pCheckBox->SetState(static_cast<TriState>(nValue));
}
return true;
@ -259,9 +247,9 @@ Any VCLXAccessibleCheckBox::getCurrentValue( )
Any aValue;
VCLXCheckBox* pVCLXCheckBox = static_cast< VCLXCheckBox* >( GetVCLXWindow() );
if ( pVCLXCheckBox )
aValue <<= static_cast<sal_Int32>(pVCLXCheckBox->getState());
VclPtr<CheckBox> pCheckBox = GetAs<CheckBox>();
if (pCheckBox)
aValue <<= static_cast<sal_Int32>(pCheckBox->GetState());
return aValue;
}
@ -273,8 +261,8 @@ sal_Bool VCLXAccessibleCheckBox::setCurrentValue( const Any& aNumber )
bool bReturn = false;
VCLXCheckBox* pVCLXCheckBox = static_cast< VCLXCheckBox* >( GetVCLXWindow() );
if ( pVCLXCheckBox )
VclPtr<CheckBox> pCheckBox = GetAs<CheckBox>();
if (pCheckBox)
{
sal_Int32 nValue = 0, nValueMin = 0, nValueMax = 0;
OSL_VERIFY( aNumber >>= nValue );
@ -285,7 +273,7 @@ sal_Bool VCLXAccessibleCheckBox::setCurrentValue( const Any& aNumber )
else if ( nValue > nValueMax )
nValue = nValueMax;
pVCLXCheckBox->setState( static_cast<sal_Int16>(nValue) );
pCheckBox->SetState(static_cast<TriState>(nValue));
bReturn = true;
}

10
accessibility/source/standard/vclxaccessibleedit.cxx
View file

@ -20,7 +20,6 @@
#include <standard/vclxaccessibleedit.hxx>
#include <toolkit/awt/vclxwindows.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
@ -38,6 +37,7 @@
#include <vcl/toolkit/vclmedit.hxx>
#include <vcl/textdata.hxx>
#include <vcl/txtattr.hxx>
#include <vcl/unohelp.hxx>
#include <vcl/xtextedt.hxx>
#include <sot/exchange.hxx>
#include <sot/formats.hxx>
@ -108,12 +108,12 @@ void VCLXAccessibleEdit::FillAccessibleStateSet( sal_Int64& rStateSet )
{
VCLXAccessibleTextComponent::FillAccessibleStateSet( rStateSet );
VCLXWindow* pVCLXWindow = GetVCLXWindow();
if (pVCLXWindow)
vcl::Window* pWindow = GetWindow();
if (pWindow)
{
rStateSet |= AccessibleStateType::FOCUSABLE;
if (GetWindow() && GetWindow()->GetType() == WindowType::MULTILINEEDIT)
if (pWindow->GetType() == WindowType::MULTILINEEDIT)
rStateSet |= AccessibleStateType::MULTI_LINE;
else
rStateSet |= AccessibleStateType::SINGLE_LINE;
@ -390,7 +390,7 @@ awt::Rectangle VCLXAccessibleEdit::getCharacterBounds( sal_Int32 nIndex )
}
else
{
aBounds = VCLUnoHelper::ConvertToAWTRect(pControl->GetCharacterBounds(nIndex));
aBounds = vcl::unohelper::ConvertToAWTRect(pControl->GetCharacterBounds(nIndex));
}
}

11
accessibility/source/standard/vclxaccessibleheaderbaritem.cxx
View file

@ -29,7 +29,7 @@
#include <unotools/accessiblerelationsethelper.hxx>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <vcl/unohelp.hxx>
#include <i18nlangtag/languagetag.hxx>
using namespace ::com::sun::star;
@ -76,7 +76,7 @@ awt::Rectangle VCLXAccessibleHeaderBarItem::implGetBounds()
if ( m_pHeadBar )
aBounds
= VCLUnoHelper::ConvertToAWTRect(m_pHeadBar->GetItemRect(sal_uInt16(m_nIndexInParent)));
= vcl::unohelper::ConvertToAWTRect(m_pHeadBar->GetItemRect(sal_uInt16(m_nIndexInParent)));
return aBounds;
}
@ -227,13 +227,6 @@ sal_Int32 VCLXAccessibleHeaderBarItem::getBackground()
// XAccessibleExtendedComponent
Reference< awt::XFont > VCLXAccessibleHeaderBarItem::getFont()
{
return Reference< awt::XFont >();
}
OUString VCLXAccessibleHeaderBarItem::getTitledBorderText()
{
return OUString();

6
accessibility/source/standard/vclxaccessiblelist.cxx
View file

@ -30,10 +30,10 @@
#include <comphelper/sequence.hxx>
#include <comphelper/types.hxx>
#include <o3tl/safeint.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <vcl/svapp.hxx>
#include <vcl/toolkit/combobox.hxx>
#include <vcl/toolkit/lstbox.hxx>
#include <vcl/unohelp.hxx>
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
@ -877,7 +877,7 @@ awt::Rectangle VCLXAccessibleList::implGetBounds()
&& (m_pListBoxHelper->GetStyle() & WB_DROPDOWN ) == WB_DROPDOWN )
{
if ( m_pListBoxHelper->IsInDropDown() )
aBounds = VCLUnoHelper::ConvertToAWTRect(m_pListBoxHelper->GetDropDownPosSizePixel());
aBounds = vcl::unohelper::ConvertToAWTRect(m_pListBoxHelper->GetDropDownPosSizePixel());
}
else
{
@ -910,7 +910,7 @@ awt::Point VCLXAccessibleList::getLocationOnScreen( )
&& (m_pListBoxHelper->GetStyle() & WB_DROPDOWN ) == WB_DROPDOWN )
{
if ( m_pListBoxHelper->IsInDropDown() )
aPos = VCLUnoHelper::ConvertToAWTPoint(
aPos = vcl::unohelper::ConvertToAWTPoint(
m_pListBoxHelper->GetDropDownPosSizePixel().TopLeft());
}
else

16
accessibility/source/standard/vclxaccessiblelistitem.cxx
View file

@ -18,7 +18,6 @@
*/
#include <standard/vclxaccessiblelistitem.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <helper/IComboListBoxHelper.hxx>
#include <com/sun/star/awt/Rectangle.hpp>
@ -32,6 +31,7 @@
#include <utility>
#include <vcl/svapp.hxx>
#include <vcl/toolkit/lstbox.hxx>
#include <vcl/unohelp.hxx>
#include <vcl/unohelp2.hxx>
#include <vcl/settings.hxx>
#include <unotools/accessiblerelationsethelper.hxx>
@ -289,7 +289,7 @@ sal_Bool SAL_CALL VCLXAccessibleListItem::containsPoint( const awt::Point& _aPoi
{
tools::Rectangle aRect(pListBoxHelper->GetBoundingRectangle(static_cast<sal_uInt16>(m_nIndexInParent)));
aRect.Move(-aRect.Left(), -aRect.Top());
bInside = aRect.Contains(VCLUnoHelper::ConvertToVCLPoint(_aPoint));
bInside = aRect.Contains(vcl::unohelper::ConvertToVCLPoint(_aPoint));
}
return bInside;
}
@ -307,7 +307,7 @@ awt::Rectangle SAL_CALL VCLXAccessibleListItem::getBounds( )
awt::Rectangle aRect;
::accessibility::IComboListBoxHelper* pListBoxHelper = m_xParent.is() ? m_xParent->getListBoxHelper() : nullptr;
if (pListBoxHelper)
aRect = VCLUnoHelper::ConvertToAWTRect(
aRect = vcl::unohelper::ConvertToAWTRect(
pListBoxHelper->GetBoundingRectangle(static_cast<sal_uInt16>(m_nIndexInParent)));
return aRect;
@ -325,7 +325,7 @@ awt::Point SAL_CALL VCLXAccessibleListItem::getLocation( )
tools::Rectangle aRect = pListBoxHelper->GetBoundingRectangle( static_cast<sal_uInt16>(m_nIndexInParent) );
aPoint = aRect.TopLeft();
}
return VCLUnoHelper::ConvertToAWTPoint(aPoint);
return vcl::unohelper::ConvertToAWTPoint(aPoint);
}
awt::Point SAL_CALL VCLXAccessibleListItem::getLocationOnScreen( )
@ -341,7 +341,7 @@ awt::Point SAL_CALL VCLXAccessibleListItem::getLocationOnScreen( )
aPoint = aRect.TopLeft();
aPoint += Point(pListBoxHelper->GetWindowExtentsAbsolute().TopLeft());
}
return VCLUnoHelper::ConvertToAWTPoint(aPoint);
return vcl::unohelper::ConvertToAWTPoint(aPoint);
}
awt::Size SAL_CALL VCLXAccessibleListItem::getSize( )
@ -354,7 +354,7 @@ awt::Size SAL_CALL VCLXAccessibleListItem::getSize( )
if (pListBoxHelper)
aSize = pListBoxHelper->GetBoundingRectangle( static_cast<sal_uInt16>(m_nIndexInParent) ).GetSize();
return VCLUnoHelper::ConvertToAWTSize(aSize);
return vcl::unohelper::ConvertToAWTSize(aSize);
}
void SAL_CALL VCLXAccessibleListItem::grabFocus( )
@ -414,7 +414,7 @@ awt::Rectangle SAL_CALL VCLXAccessibleListItem::getCharacterBounds( sal_Int32 nI
tools::Rectangle aCharRect = pListBoxHelper->GetEntryCharacterBounds( m_nIndexInParent, nIndex );
tools::Rectangle aItemRect = pListBoxHelper->GetBoundingRectangle( static_cast<sal_uInt16>(m_nIndexInParent) );
aCharRect.Move( -aItemRect.Left(), -aItemRect.Top() );
aBounds = VCLUnoHelper::ConvertToAWTRect(aCharRect);
aBounds = vcl::unohelper::ConvertToAWTRect(aCharRect);
}
return aBounds;
@ -438,7 +438,7 @@ sal_Int32 SAL_CALL VCLXAccessibleListItem::getIndexAtPoint( const awt::Point& aP
{
sal_Int32 nPos = LISTBOX_ENTRY_NOTFOUND;
tools::Rectangle aItemRect = pListBoxHelper->GetBoundingRectangle( static_cast<sal_uInt16>(m_nIndexInParent) );
Point aPnt(VCLUnoHelper::ConvertToVCLPoint(aPoint));
Point aPnt(vcl::unohelper::ConvertToVCLPoint(aPoint));
aPnt += aItemRect.TopLeft();
sal_Int32 nI = pListBoxHelper->GetIndexForPoint( aPnt, nPos );
if ( nI != -1 && m_nIndexInParent == nPos )

2
accessibility/source/standard/vclxaccessibleradiobutton.cxx
View file

@ -30,11 +30,11 @@
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
#include <vcl/accessibility/strings.hxx>
#include <vcl/window.hxx>
#include <vcl/toolkit/button.hxx>
#include <vcl/event.hxx>
#include <vcl/vclevent.hxx>
#include <strings.hxx>
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;

2
accessibility/source/standard/vclxaccessiblescrollbar.cxx
View file

@ -28,9 +28,9 @@
#include <com/sun/star/awt/ScrollBarOrientation.hpp>
#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
#include <comphelper/accessiblecontexthelper.hxx>
#include <vcl/accessibility/strings.hxx>
#include <vcl/toolkit/scrbar.hxx>
#include <vcl/vclevent.hxx>
#include <strings.hxx>
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;

4
accessibility/source/standard/vclxaccessiblestatusbar.cxx
View file

@ -19,12 +19,12 @@
#include <standard/vclxaccessiblestatusbar.hxx>
#include <standard/vclxaccessiblestatusbaritem.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
#include <comphelper/accessiblecontexthelper.hxx>
#include <o3tl/safeint.hxx>
#include <vcl/status.hxx>
#include <vcl/unohelp.hxx>
#include <vcl/vclevent.hxx>
@ -307,7 +307,7 @@ Reference< XAccessible > VCLXAccessibleStatusBar::getAccessibleAtPoint( const aw
Reference< XAccessible > xChild;
if ( m_pStatusBar )
{
sal_uInt16 nItemId = m_pStatusBar->GetItemId(VCLUnoHelper::ConvertToVCLPoint(rPoint));
sal_uInt16 nItemId = m_pStatusBar->GetItemId(vcl::unohelper::ConvertToVCLPoint(rPoint));
sal_Int32 nItemPos = m_pStatusBar->GetItemPos( nItemId );
if ( nItemPos >= 0 && o3tl::make_unsigned(nItemPos) < m_aAccessibleChildren.size() )
xChild = getAccessibleChild( nItemPos );

28
accessibility/source/standard/vclxaccessiblestatusbaritem.cxx
View file

@ -18,8 +18,6 @@
*/
#include <standard/vclxaccessiblestatusbaritem.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <helper/characterattributeshelper.hxx>
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
#include <com/sun/star/accessibility/AccessibleRole.hpp>
@ -30,8 +28,10 @@
#include <comphelper/accessiblecontexthelper.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <unotools/accessiblerelationsethelper.hxx>
#include <vcl/accessibility/characterattributeshelper.hxx>
#include <vcl/ctrl.hxx>
#include <vcl/svapp.hxx>
#include <vcl/unohelp.hxx>
#include <vcl/unohelp2.hxx>
#include <vcl/status.hxx>
#include <vcl/settings.hxx>
@ -148,7 +148,7 @@ awt::Rectangle VCLXAccessibleStatusBarItem::implGetBounds()
awt::Rectangle aBounds( 0, 0, 0, 0 );
if ( m_pStatusBar )
aBounds = VCLUnoHelper::ConvertToAWTRect(m_pStatusBar->GetItemRect(m_nItemId));
aBounds = vcl::unohelper::ConvertToAWTRect(m_pStatusBar->GetItemRect(m_nItemId));
return aBounds;
}
@ -378,24 +378,6 @@ sal_Int32 VCLXAccessibleStatusBarItem::getBackground( )
// XAccessibleExtendedComponent
Reference< awt::XFont > VCLXAccessibleStatusBarItem::getFont( )
{
OExternalLockGuard aGuard( this );
Reference< awt::XFont > xFont;
Reference< XAccessible > xParent = getAccessibleParent();
if ( xParent.is() )
{
Reference< XAccessibleExtendedComponent > xParentComp( xParent->getAccessibleContext(), UNO_QUERY );
if ( xParentComp.is() )
xFont = xParentComp->getFont();
}
return xFont;
}
OUString VCLXAccessibleStatusBarItem::getTitledBorderText( )
{
OExternalLockGuard aGuard( this );
@ -500,7 +482,7 @@ awt::Rectangle VCLXAccessibleStatusBarItem::getCharacterBounds( sal_Int32 nIndex
m_pStatusBar->RecordLayoutData( &aLayoutData, aItemRect );
tools::Rectangle aCharRect = aLayoutData.GetCharacterBounds( nIndex );
aCharRect.Move( -aItemRect.Left(), -aItemRect.Top() );
aBounds = VCLUnoHelper::ConvertToAWTRect(aCharRect);
aBounds = vcl::unohelper::ConvertToAWTRect(aCharRect);
}
return aBounds;
@ -517,7 +499,7 @@ sal_Int32 VCLXAccessibleStatusBarItem::getIndexAtPoint( const awt::Point& aPoint
vcl::ControlLayoutData aLayoutData;
tools::Rectangle aItemRect = m_pStatusBar->GetItemRect( m_nItemId );
m_pStatusBar->RecordLayoutData( &aLayoutData, aItemRect );
Point aPnt(VCLUnoHelper::ConvertToVCLPoint(aPoint));
Point aPnt(vcl::unohelper::ConvertToVCLPoint(aPoint));
aPnt += aItemRect.TopLeft();
nIndex = aLayoutData.GetIndexForPoint( aPnt );
}

32
accessibility/source/standard/vclxaccessibletabpage.cxx
View file

@ -18,8 +18,6 @@
*/
#include <standard/vclxaccessibletabpage.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <helper/characterattributeshelper.hxx>
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
#include <com/sun/star/accessibility/AccessibleRole.hpp>
@ -30,8 +28,10 @@
#include <comphelper/accessiblecontexthelper.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <unotools/accessiblerelationsethelper.hxx>
#include <vcl/accessibility/characterattributeshelper.hxx>
#include <vcl/mnemonic.hxx>
#include <vcl/svapp.hxx>
#include <vcl/unohelp.hxx>
#include <vcl/unohelp2.hxx>
#include <vcl/tabctrl.hxx>
#include <vcl/tabpage.hxx>
@ -191,7 +191,7 @@ awt::Rectangle VCLXAccessibleTabPage::implGetBounds()
awt::Rectangle aBounds( 0, 0, 0, 0 );
if ( m_pTabControl )
aBounds = VCLUnoHelper::ConvertToAWTRect(m_pTabControl->GetTabBounds(m_nPageId));
aBounds = vcl::unohelper::ConvertToAWTRect(m_pTabControl->GetTabBounds(m_nPageId));
return aBounds;
}
@ -407,8 +407,8 @@ Reference< XAccessible > VCLXAccessibleTabPage::getAccessibleAtPoint( const awt:
Reference< XAccessibleComponent > xComp( xAcc->getAccessibleContext(), UNO_QUERY );
if ( xComp.is() )
{
tools::Rectangle aRect = VCLUnoHelper::ConvertToVCLRect(xComp->getBounds());
Point aPos = VCLUnoHelper::ConvertToVCLPoint(rPoint);
tools::Rectangle aRect = vcl::unohelper::ConvertToVCLRect(xComp->getBounds());
Point aPos = vcl::unohelper::ConvertToVCLPoint(rPoint);
if ( aRect.Contains( aPos ) )
{
return xAcc;
@ -469,24 +469,6 @@ sal_Int32 VCLXAccessibleTabPage::getBackground( )
// XAccessibleExtendedComponent
Reference< awt::XFont > VCLXAccessibleTabPage::getFont( )
{
OExternalLockGuard aGuard( this );
Reference< awt::XFont > xFont;
Reference< XAccessible > xParent = getAccessibleParent();
if ( xParent.is() )
{
Reference< XAccessibleExtendedComponent > xParentComp( xParent->getAccessibleContext(), UNO_QUERY );
if ( xParentComp.is() )
xFont = xParentComp->getFont();
}
return xFont;
}
OUString VCLXAccessibleTabPage::getTitledBorderText( )
{
OExternalLockGuard aGuard( this );
@ -586,7 +568,7 @@ awt::Rectangle VCLXAccessibleTabPage::getCharacterBounds( sal_Int32 nIndex )
tools::Rectangle aPageRect = m_pTabControl->GetTabBounds( m_nPageId );
tools::Rectangle aCharRect; // m_pTabControl->GetCharacterBounds( m_nPageId, nIndex );
aCharRect.Move( -aPageRect.Left(), -aPageRect.Top() );
aBounds = VCLUnoHelper::ConvertToAWTRect(aCharRect);
aBounds = vcl::unohelper::ConvertToAWTRect(aCharRect);
}
return aBounds;
@ -602,7 +584,7 @@ sal_Int32 VCLXAccessibleTabPage::getIndexAtPoint( const awt::Point& /*aPoint*/ )
// {
// sal_uInt16 nPageId = 0;
// tools::Rectangle aPageRect = m_pTabControl->GetTabBounds( m_nPageId );
// Point aPnt( VCLUnoHelper::ConvertToVCLPoint( aPoint ) );
// Point aPnt( vcl::unohelper::ConvertToVCLPoint( aPoint ) );
// aPnt += aPageRect.TopLeft();
// sal_Int32 nI = m_pTabControl->GetIndexForPoint( aPnt, nPageId );
// if ( nI != -1 && m_nPageId == nPageId )

4
accessibility/source/standard/vclxaccessibletabpagewindow.cxx
View file

@ -19,9 +19,9 @@
#include <standard/vclxaccessibletabpagewindow.hxx>
#include <comphelper/accessiblecontexthelper.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <vcl/tabctrl.hxx>
#include <vcl/tabpage.hxx>
#include <vcl/unohelp.hxx>
#include <sal/log.hxx>
using namespace ::com::sun::star;
@ -72,7 +72,7 @@ awt::Rectangle VCLXAccessibleTabPageWindow::implGetBounds()
{
tools::Rectangle aRect( m_pTabPage->GetPosPixel(), m_pTabPage->GetSizePixel() );
aRect.Move( -aPageRect.Left(), -aPageRect.Top() );
aBounds = VCLUnoHelper::ConvertToAWTRect(aRect);
aBounds = vcl::unohelper::ConvertToAWTRect(aRect);
}
}

8
accessibility/source/standard/vclxaccessibletextcomponent.cxx
View file

@ -18,20 +18,20 @@
*/
#include <standard/vclxaccessibletextcomponent.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <helper/characterattributeshelper.hxx>
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
#include <com/sun/star/datatransfer/clipboard/XClipboard.hpp>
#include <com/sun/star/datatransfer/clipboard/XFlushableClipboard.hpp>
#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
#include <comphelper/accessiblecontexthelper.hxx>
#include <vcl/accessibility/characterattributeshelper.hxx>
#include <vcl/window.hxx>
#include <vcl/mnemonic.hxx>
#include <vcl/svapp.hxx>
#include <vcl/unohelp2.hxx>
#include <vcl/ctrl.hxx>
#include <vcl/settings.hxx>
#include <vcl/unohelp.hxx>
#include <i18nlangtag/languagetag.hxx>
using namespace ::com::sun::star;
@ -250,7 +250,7 @@ awt::Rectangle VCLXAccessibleTextComponent::getCharacterBounds( sal_Int32 nIndex
awt::Rectangle aRect;
VclPtr< Control > pControl = GetAs< Control >();
if ( pControl )
aRect = VCLUnoHelper::ConvertToAWTRect(pControl->GetCharacterBounds(nIndex));
aRect = vcl::unohelper::ConvertToAWTRect(pControl->GetCharacterBounds(nIndex));
return aRect;
}
@ -271,7 +271,7 @@ sal_Int32 VCLXAccessibleTextComponent::getIndexAtPoint( const awt::Point& aPoint
sal_Int32 nIndex = -1;
VclPtr< Control > pControl = GetAs< Control >();
if ( pControl )
nIndex = pControl->GetIndexForPoint(VCLUnoHelper::ConvertToVCLPoint(aPoint));
nIndex = pControl->GetIndexForPoint(vcl::unohelper::ConvertToVCLPoint(aPoint));
return nIndex;
}

4
accessibility/source/standard/vclxaccessibletoolbox.cxx
View file

@ -20,13 +20,13 @@
#include <standard/vclxaccessibletoolbox.hxx>
#include <standard/vclxaccessibletoolboxitem.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
#include <o3tl/safeint.hxx>
#include <vcl/toolbox.hxx>
#include <vcl/unohelp.hxx>
#include <vcl/vclevent.hxx>
#include <comphelper/accessiblecontexthelper.hxx>
#include <comphelper/accessiblewrapper.hxx>
@ -664,7 +664,7 @@ Reference< XAccessible > SAL_CALL VCLXAccessibleToolBox::getAccessibleAtPoint( c
if ( pToolBox )
{
ToolBox::ImplToolItems::size_type nItemPos
= pToolBox->GetItemPos(VCLUnoHelper::ConvertToVCLPoint(_rPoint));
= pToolBox->GetItemPos(vcl::unohelper::ConvertToVCLPoint(_rPoint));
if ( nItemPos != ToolBox::ITEM_NOTFOUND )
xAccessible = getAccessibleChild( nItemPos );
}

14
accessibility/source/standard/vclxaccessibletoolboxitem.cxx
View file

@ -18,7 +18,6 @@
*/
#include <standard/vclxaccessibletoolboxitem.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <helper/accresmgr.hxx>
#include <strings.hrc>
#include <com/sun/star/awt/Rectangle.hpp>
@ -31,13 +30,14 @@
#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
#include <comphelper/accessiblecontexthelper.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <vcl/accessibility/strings.hxx>
#include <vcl/svapp.hxx>
#include <vcl/toolbox.hxx>
#include <vcl/unohelp.hxx>
#include <vcl/unohelp2.hxx>
#include <vcl/help.hxx>
#include <vcl/settings.hxx>
#include <unotools/accessiblerelationsethelper.hxx>
#include <strings.hxx>
#include <sal/log.hxx>
#include <i18nlangtag/languagetag.hxx>
@ -208,7 +208,7 @@ awt::Rectangle VCLXAccessibleToolBoxItem::implGetBounds( )
{
awt::Rectangle aRect;
if ( m_pToolBox )
aRect = VCLUnoHelper::ConvertToAWTRect(m_pToolBox->GetItemPosRect(m_nIndexInParent));
aRect = vcl::unohelper::ConvertToAWTRect(m_pToolBox->GetItemPosRect(m_nIndexInParent));
return aRect;
}
@ -477,7 +477,7 @@ awt::Rectangle SAL_CALL VCLXAccessibleToolBoxItem::getCharacterBounds( sal_Int32
tools::Rectangle aCharRect = m_pToolBox->GetCharacterBounds( m_nItemId, nIndex );
tools::Rectangle aItemRect = m_pToolBox->GetItemRect( m_nItemId );
aCharRect.Move( -aItemRect.Left(), -aItemRect.Top() );
aBounds = VCLUnoHelper::ConvertToAWTRect(aCharRect);
aBounds = vcl::unohelper::ConvertToAWTRect(aCharRect);
}
return aBounds;
@ -492,7 +492,7 @@ sal_Int32 SAL_CALL VCLXAccessibleToolBoxItem::getIndexAtPoint( const awt::Point&
{
ToolBoxItemId nItemId;
tools::Rectangle aItemRect = m_pToolBox->GetItemRect( m_nItemId );
Point aPnt(VCLUnoHelper::ConvertToVCLPoint(aPoint));
Point aPnt(vcl::unohelper::ConvertToVCLPoint(aPoint));
aPnt += aItemRect.TopLeft();
sal_Int32 nIdx = m_pToolBox->GetIndexForPoint( aPnt, nItemId );
if ( nIdx != -1 && nItemId == m_nItemId )
@ -594,10 +594,6 @@ sal_Int32 SAL_CALL VCLXAccessibleToolBoxItem::getBackground( )
}
// XAccessibleExtendedComponent
Reference< awt::XFont > SAL_CALL VCLXAccessibleToolBoxItem::getFont( )
{
return uno::Reference< awt::XFont >();
}
OUString SAL_CALL VCLXAccessibleToolBoxItem::getTitledBorderText( )
{

8
autogen.sh
View file

@ -45,7 +45,10 @@ sub sanity_checks($)
$autoconf => "autoconf is required",
$aclocal => "$aclocal is required",
);
if ($ENV{WSL_DISTRO_NAME} && $ENV{PATH} =~ /mingw64/) {
# for wsl-as-helper build we only need the m4 macros like for macOS
delete $required{'pkg-config'};
}
for my $elem (@path) {
for my $app (keys %required) {
if (-f "$elem/$app") {
@ -160,7 +163,8 @@ if (defined $ENV{LODE_HOME})
my $aclocal_flags = $ENV{ACLOCAL_FLAGS};
$aclocal_flags .= " -I $src_path/m4";
$aclocal_flags .= " -I $src_path/m4/mac" if ($system eq 'Darwin');
# the m4/mac directory provides the pkg-config macros used in configure
$aclocal_flags .= " -I $src_path/m4/mac" if ($system eq 'Darwin' || ($ENV{WSL_DISTRO_NAME} && $ENV{PATH} =~ /mingw64/));
$ENV{AUTOMAKE_EXTRA_FLAGS} = '--warnings=no-portability' if (!($system eq 'Darwin'));

30
basctl/source/accessibility/accessibledialogcontrolshape.cxx
View file

@ -35,6 +35,7 @@
#include <comphelper/diagnose_ex.hxx>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
#include <vcl/unohelp.hxx>
#include <i18nlangtag/languagetag.hxx>
namespace basctl
@ -146,7 +147,7 @@ awt::Rectangle AccessibleDialogControlShape::GetBounds() const
// clip the shape's bounding box with the bounding box of its parent
tools::Rectangle aParentRect( Point( 0, 0 ), m_pDialogWindow->GetSizePixel() );
aRect = aRect.GetIntersection( aParentRect );
aBounds = VCLUnoHelper::ConvertToAWTRect(aRect);
aBounds = vcl::unohelper::ConvertToAWTRect(aRect);
}
}
@ -480,33 +481,6 @@ sal_Int32 AccessibleDialogControlShape::getBackground( )
// XAccessibleExtendedComponent
Reference< awt::XFont > AccessibleDialogControlShape::getFont( )
{
OExternalLockGuard aGuard( this );
Reference< awt::XFont > xFont;
vcl::Window* pWindow = GetWindow();
if ( pWindow )
{
Reference< awt::XDevice > xDev( pWindow->GetComponentInterface(), UNO_QUERY );
if ( xDev.is() )
{
vcl::Font aFont;
if ( pWindow->IsControlFont() )
aFont = pWindow->GetControlFont();
else
aFont = pWindow->GetFont();
rtl::Reference<VCLXFont> pVCLXFont = new VCLXFont;
pVCLXFont->Init( *xDev, aFont );
xFont = pVCLXFont;
}
}
return xFont;
}
OUString AccessibleDialogControlShape::getTitledBorderText( )
{
OExternalLockGuard aGuard( this );

35
basctl/source/accessibility/accessibledialogwindow.cxx
View file

@ -35,10 +35,9 @@
#include <cppuhelper/supportsservice.hxx>
#include <tools/debug.hxx>
#include <unotools/accessiblerelationsethelper.hxx>
#include <toolkit/awt/vclxfont.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
#include <vcl/unohelp.hxx>
#include <i18nlangtag/languagetag.hxx>
namespace basctl
@ -409,7 +408,7 @@ awt::Rectangle AccessibleDialogWindow::implGetBounds()
{
awt::Rectangle aBounds;
if ( m_pDialogWindow )
aBounds = VCLUnoHelper::ConvertToAWTRect(
aBounds = vcl::unohelper::ConvertToAWTRect(
tools::Rectangle(m_pDialogWindow->GetPosPixel(), m_pDialogWindow->GetSizePixel()));
return aBounds;
@ -685,8 +684,8 @@ Reference< XAccessible > AccessibleDialogWindow::getAccessibleAtPoint( const awt
Reference< XAccessibleComponent > xComp( xAcc->getAccessibleContext(), UNO_QUERY );
if ( xComp.is() )
{
tools::Rectangle aRect = VCLUnoHelper::ConvertToVCLRect(xComp->getBounds());
Point aPos = VCLUnoHelper::ConvertToVCLPoint(rPoint);
tools::Rectangle aRect = vcl::unohelper::ConvertToVCLRect(xComp->getBounds());
Point aPos = vcl::unohelper::ConvertToVCLPoint(rPoint);
if ( aRect.Contains( aPos ) )
{
xChild = std::move(xAcc);
@ -750,32 +749,6 @@ sal_Int32 AccessibleDialogWindow::getBackground( )
// XAccessibleExtendedComponent
Reference< awt::XFont > AccessibleDialogWindow::getFont( )
{
OExternalLockGuard aGuard( this );
Reference< awt::XFont > xFont;
if ( m_pDialogWindow )
{
Reference< awt::XDevice > xDev( m_pDialogWindow->GetComponentInterface(), UNO_QUERY );
if ( xDev.is() )
{
vcl::Font aFont;
if ( m_pDialogWindow->IsControlFont() )
aFont = m_pDialogWindow->GetControlFont();
else
aFont = m_pDialogWindow->GetFont();
rtl::Reference<VCLXFont> pVCLXFont = new VCLXFont;
pVCLXFont->Init( *xDev, aFont );
xFont = pVCLXFont;
}
}
return xFont;
}
OUString AccessibleDialogWindow::getTitledBorderText( )
{
OExternalLockGuard aGuard( this );

3
basctl/source/basicide/moduldlg.cxx
View file

@ -981,7 +981,8 @@ SbModule* createModImpl(weld::Window* pWin, const ScriptDocument& rDocument,
// the module has existed
if( rDocument.hasModule( aLibName, aModName ) )
return nullptr;
rDocument.createModule( aLibName, aModName, bMain, sModuleCode );
if (!rDocument.createModule(aLibName, aModName, bMain, sModuleCode))
return nullptr;
BasicManager* pBasMgr = rDocument.getBasicManager();
StarBASIC* pBasic = pBasMgr? pBasMgr->GetLib( aLibName ) : nullptr;
if ( pBasic )

1
basctl/source/inc/accessibledialogcontrolshape.hxx
View file

@ -110,7 +110,6 @@ public:
virtual sal_Int32 SAL_CALL getBackground( ) override;
// XAccessibleExtendedComponent
virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont( ) override;
virtual OUString SAL_CALL getTitledBorderText( ) override;
virtual OUString SAL_CALL getToolTipText( ) override;
};

1
basctl/source/inc/accessibledialogwindow.hxx
View file

@ -124,7 +124,6 @@ public:
virtual sal_Int32 SAL_CALL getBackground( ) override;
// XAccessibleExtendedComponent
virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont( ) override;
virtual OUString SAL_CALL getTitledBorderText( ) override;
virtual OUString SAL_CALL getToolTipText( ) override;

12
canvas/source/directx/dx_canvas.cxx
View file

@ -122,17 +122,17 @@ namespace dxcanvas
OUString SAL_CALL Canvas::getServiceName( )
{
return "com.sun.star.rendering.Canvas.GDI+";
return u"com.sun.star.rendering.Canvas.GDI+"_ustr;
}
// XServiceInfo
css::uno::Sequence<OUString> Canvas::getSupportedServiceNames( )
{
return { "com.sun.star.rendering.Canvas.GDI+" };
return { u"com.sun.star.rendering.Canvas.GDI+"_ustr };
}
OUString Canvas::getImplementationName( )
{
return "com.sun.star.comp.rendering.Canvas.GDI+";
return u"com.sun.star.comp.rendering.Canvas.GDI+"_ustr;
}
sal_Bool Canvas::supportsService( const OUString& sServiceName )
{
@ -212,17 +212,17 @@ namespace dxcanvas
OUString SAL_CALL BitmapCanvas::getServiceName( )
{
return "com.sun.star.rendering.BitmapCanvas.GDI+";
return u"com.sun.star.rendering.BitmapCanvas.GDI+"_ustr;
}
// XServiceInfo
css::uno::Sequence<OUString> BitmapCanvas::getSupportedServiceNames( )
{
return { "com.sun.star.rendering.BitmapCanvas.GDI+" };
return { u"com.sun.star.rendering.BitmapCanvas.GDI+"_ustr };
}
OUString BitmapCanvas::getImplementationName( )
{
return "com.sun.star.comp.rendering.BitmapCanvas.GDI+";
return u"com.sun.star.comp.rendering.BitmapCanvas.GDI+"_ustr;
}
sal_Bool BitmapCanvas::supportsService( const OUString& sServiceName )
{

19
chart2/source/controller/accessibility/AccessibleChartElement.cxx
View file

@ -138,25 +138,6 @@ OUString SAL_CALL AccessibleChartElement::getAccessibleDescription()
}
// ________ AccessibleChartElement::XAccessibleExtendedComponent ________
Reference< awt::XFont > SAL_CALL AccessibleChartElement::getFont()
{
CheckDisposeState();
Reference< awt::XFont > xFont;
Reference< awt::XDevice > xDevice( Reference< awt::XWindow >( GetInfo().m_xWindow ), uno::UNO_QUERY );
if( xDevice.is())
{
Reference< beans::XMultiPropertySet > xObjProp(
ObjectIdentifier::getObjectPropertySet(
GetInfo().m_aOID.getObjectCID(), GetInfo().m_xChartDocument ), uno::UNO_QUERY );
awt::FontDescriptor aDescr(
CharacterProperties::createFontDescriptorFromPropertySet( xObjProp ));
xFont = xDevice->getFont( aDescr );
}
return xFont;
}
OUString SAL_CALL AccessibleChartElement::getTitledBorderText()
{

1
chart2/source/controller/accessibility/AccessibleChartElement.hxx
View file

@ -70,7 +70,6 @@ public:
virtual OUString SAL_CALL getAccessibleDescription() override;
// ________ XAccessibleExtendedComponent ________
virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont() override;
virtual OUString SAL_CALL getTitledBorderText() override;
virtual OUString SAL_CALL getToolTipText() override;

9
chart2/source/controller/accessibility/AccessibleChartShape.cxx
View file

@ -215,15 +215,6 @@ sal_Int32 AccessibleChartShape::getBackground()
}
// ________ XAccessibleExtendedComponent ________
Reference< awt::XFont > AccessibleChartShape::getFont()
{
Reference< awt::XFont > xFont;
if ( m_pAccShape.is() )
{
xFont.set( m_pAccShape->getFont() );
}
return xFont;
}
OUString AccessibleChartShape::getTitledBorderText()
{

1
chart2/source/controller/accessibility/AccessibleChartShape.hxx
View file

@ -69,7 +69,6 @@ public:
virtual sal_Int32 SAL_CALL getBackground() override;
// ________ XAccessibleExtendedComponent ________
virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont() override;
virtual OUString SAL_CALL getTitledBorderText() override;
virtual OUString SAL_CALL getToolTipText() override;

9
compilerplugins/clang/unusedfields.py
View file

@ -174,13 +174,8 @@ for d in definitionSet:
if "Guard" in fieldType:
continue
# these are just all model classes
if (srcLoc.startswith("oox/")
or srcLoc.startswith("lotuswordpro/")
or srcLoc.startswith("include/oox/")
or srcLoc.startswith("include/filter/")
or srcLoc.startswith("hwpfilter/")
or srcLoc.startswith("filter/")
or srcLoc.startswith("vcl/source/filter/")):
if (srcLoc.startswith("lotuswordpro/")
or srcLoc.startswith("hwpfilter/")):
continue
if "(lambda at " in d[0]:
continue

1
config_host.mk.in
View file

@ -383,6 +383,7 @@ export JDK_FOR_BUILD=@JDK_FOR_BUILD@
export JDK_SECURITYMANAGER_DISALLOWED_FOR_BUILD=@JDK_SECURITYMANAGER_DISALLOWED_FOR_BUILD@
export JFREEREPORT_JAR=@JFREEREPORT_JAR@
export JITC_PROCESSOR_TYPE=@JITC_PROCESSOR_TYPE@
JOM=@JOM@
export JQ=@JQ@
export JVM_ONE_PATH_CHECK=@JVM_ONE_PATH_CHECK@
export KF5_CFLAGS=$(gb_SPACE)@KF5_CFLAGS@

49
configmgr/source/xcuparser.cxx
View file

@ -219,6 +219,10 @@ XcuParser::Operation XcuParser::parseOperation(xmlreader::Span const & text) {
"invalid op " + text.convertFromUtf8());
}
bool XcuParser::isAlreadyFinalized(int finalizedLayer) const {
return finalizedLayer != Data::NO_LAYER && finalizedLayer <= valueParser_.getLayer();
}
void XcuParser::handleComponentData(xmlreader::XmlReader & reader) {
OStringBuffer buf(256);
buf.append('.');
@ -301,14 +305,13 @@ void XcuParser::handleComponentData(xmlreader::XmlReader & reader) {
throw css::uno::RuntimeException(
"invalid operation on root node in " + reader.getUrl());
}
int finalizedLayer = std::min(
finalized ? valueParser_.getLayer() : Data::NO_LAYER,
node->getFinalized());
node->setFinalized(finalizedLayer);
if (finalizedLayer < valueParser_.getLayer()) {
if (isAlreadyFinalized(node->getFinalized())) {
state_.push(State::Ignore(true));
return;
}
if (finalized) {
node->setFinalized(valueParser_.getLayer());
}
state_.push(State::Modify(node));
}
@ -367,7 +370,7 @@ void XcuParser::handleItem(xmlreader::XmlReader & reader) {
default:
break;
}
if (finalizedLayer < valueParser_.getLayer()) {
if (isAlreadyFinalized(finalizedLayer)) {
state_.push(State::Ignore(true));
return;
}
@ -660,14 +663,13 @@ void XcuParser::handlePlainGroupProp(
state_.push(State::Ignore(true));
return;
}
int finalizedLayer = std::min(
finalized ? valueParser_.getLayer() : Data::NO_LAYER,
property->getFinalized());
property->setFinalized(finalizedLayer);
if (finalizedLayer < valueParser_.getLayer()) {
if (isAlreadyFinalized(property->getFinalized())) {
state_.push(State::Ignore(true));
return;
}
if (finalized) {
property->setFinalized(valueParser_.getLayer());
}
if (type != TYPE_ERROR && property->getStaticType() != TYPE_ANY &&
type != property->getStaticType())
{
@ -703,14 +705,13 @@ void XcuParser::handleLocalizedGroupProp(
state_.push(State::Ignore(true));
return;
}
int finalizedLayer = std::min(
finalized ? valueParser_.getLayer() : Data::NO_LAYER,
property->getFinalized());
property->setFinalized(finalizedLayer);
if (finalizedLayer < valueParser_.getLayer()) {
if (isAlreadyFinalized(property->getFinalized())) {
state_.push(State::Ignore(true));
return;
}
if (finalized) {
property->setFinalized(valueParser_.getLayer());
}
if (type != TYPE_ERROR && property->getStaticType() != TYPE_ANY &&
type != property->getStaticType())
{
@ -798,14 +799,13 @@ void XcuParser::handleGroupNode(
throw css::uno::RuntimeException(
"invalid operation on group node in " + reader.getUrl());
}
int finalizedLayer = std::min(
finalized ? valueParser_.getLayer() : Data::NO_LAYER,
child->getFinalized());
child->setFinalized(finalizedLayer);
if (finalizedLayer < valueParser_.getLayer()) {
if (isAlreadyFinalized(child->getFinalized())) {
state_.push(State::Ignore(true));
return;
}
if (finalized) {
child->setFinalized(valueParser_.getLayer());
}
state_.push(State::Modify(child));
}
@ -877,12 +877,15 @@ void XcuParser::handleSetNode(xmlreader::XmlReader & reader, SetNode * set) {
"set member node " + name + " references undefined template " +
templateName + " in " + reader.getUrl());
}
bool alreadyFinalized = false;
int finalizedLayer = finalized ? valueParser_.getLayer() : Data::NO_LAYER;
int mandatoryLayer = mandatory ? valueParser_.getLayer() : Data::NO_LAYER;
NodeMap & members = set->getMembers();
NodeMap::iterator i(members.find(name));
if (i != members.end()) {
finalizedLayer = std::min(finalizedLayer, i->second->getFinalized());
auto const fin = i->second->getFinalized();
alreadyFinalized = isAlreadyFinalized(fin);
finalizedLayer = std::min(finalizedLayer, fin);
i->second->setFinalized(finalizedLayer);
mandatoryLayer = std::min(mandatoryLayer, i->second->getMandatory());
i->second->setMandatory(mandatoryLayer);
@ -891,7 +894,7 @@ void XcuParser::handleSetNode(xmlreader::XmlReader & reader, SetNode * set) {
return;
}
}
if (finalizedLayer < valueParser_.getLayer()) {
if (alreadyFinalized) {
state_.push(State::Ignore(true));
return;
}

2
configmgr/source/xcuparser.hxx
View file

@ -73,6 +73,8 @@ private:
static Operation parseOperation(xmlreader::Span const & text);
bool isAlreadyFinalized(int finalizedLayer) const;
void handleComponentData(xmlreader::XmlReader & reader);
void handleItem(xmlreader::XmlReader & reader);

62
configure.ac
View file

@ -9,7 +9,7 @@ dnl in order to create a configure script.
# several non-alphanumeric characters, those are split off and used only for the
# ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea.
AC_INIT([LibreOffice],[25.2.0.0.alpha1+],[],[],[http://documentfoundation.org/])
AC_INIT([LibreOffice],[25.8.0.0.alpha0+],[],[],[http://documentfoundation.org/])
dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just fine if it is installed
dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails hard
@ -335,6 +335,7 @@ if test -n "$WSL_DISTRO_NAME" && $(echo $PATH |grep -q mingw64); then
fi
STRAWBERRY_TOOLS="$formatted_path/c/bin"
STRAWBERRY_PERL="$formatted_path/perl/bin/perl.exe"
STRAWBERRY_PERL_UNIX="$formatted_path_unix/perl/bin/perl.exe"
AC_ARG_WITH([wsl-command],
[AS_HELP_STRING([--with-wsl-command],
[Specify your wsl distro command if it isn't the default/the one used with just wsl.exe –
@ -6834,14 +6835,22 @@ dnl Testing for required Perl modules
dnl ===================================================================
AC_MSG_CHECKING([for required Perl modules])
dnl Digest::MD5 seems only be used for packaging, but is basically a given
perl_use_string="use Cwd ; use Digest::MD5"
perl_use_string_spp="use Cwd ; use Digest::MD5"
if test "$_os" = "WINNT"; then
if test -n "$PKGFORMAT"; then
for i in $PKGFORMAT; do
case "$i" in
msi)
# for getting fonts versions to use in MSI
perl_use_string="$perl_use_string ; use Font::TTF::Font"
if test -n "$WSL_ONLY_AS_HELPER"; then
# in case of a wsl-as-helper build, the packaging is done using strawberry-perl
# and not the perl provided by git-bash
perl_use_string_spp="$perl_use_string_spp ; use Font::TTF::Font"
else
perl_use_string="$perl_use_string ; use Font::TTF::Font"
fi
;;
esac
done
@ -6852,10 +6861,38 @@ if test "$with_system_hsqldb" = "yes"; then
fi
if test "$enable_openssl" = "yes" -a "$with_system_openssl" != "yes"; then
# OpenSSL needs that to build
perl_use_string="$perl_use_string ; use FindBin"
if test -n "$WSL_ONLY_AS_HELPER"; then
# OpenSSL is built via spp, FindBin is provided by default, but deps might change in future
perl_use_string_spp="$perl_use_string_spp ; use FindBin"
else
perl_use_string="$perl_use_string ; use FindBin"
fi
fi
dnl in WSL_ONLY_AS_HELPER case the test should be done with git-bash-provided-perl and not perl from
dnl the wsl container, but that can wait until we require a module that's not provided by default
if $PERL -e "$perl_use_string">/dev/null 2>&1; then
AC_MSG_RESULT([all modules found])
if test -n "$WSL_ONLY_AS_HELPER"; then
AC_MSG_CHECKING([for required Perl modules in Strawberry Perl])
if $STRAWBERRY_PERL_UNIX -e "$perl_use_string_spp">/dev/null 2>&1; then
AC_MSG_RESULT([all modules found])
else
AC_MSG_RESULT([failed to find some modules])
# Find out which modules are missing.
for i in $perl_use_string_spp; do
if test "$i" != "use" -a "$i" != ";"; then
if ! $STRAWBERRY_PERL_UNIX -e "use $i;">/dev/null 2>&1; then
missing_perl_modules="$missing_perl_modules $i"
fi
fi
done
PathFormat "$(dirname $STRAWBERRY_PERL_UNIX)"
spp_cpan_command='PATH="$(cygpath.exe -up "'$STRAWBERRY_TOOLS';'$formatted_path'"):$PATH" cpanm'
AC_MSG_ERROR([
The missing Perl modules are: $missing_perl_modules
Install them with »$spp_cpan_command $missing_perl_modules«])
fi
fi
else
AC_MSG_RESULT([failed to find some modules])
# Find out which modules are missing.
@ -10441,7 +10478,7 @@ if test \( "$cross_compiling" = yes -a -z "$PYTHON_FOR_BUILD" \) -o "$enable_pyt
SYSTEM_PYTHON=
PYTHON_VERSION_MAJOR=3
PYTHON_VERSION_MINOR=10
PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.15
PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.16
if ! grep -q -i python.*${PYTHON_VERSION} ${SRC_ROOT}/download.lst; then
AC_MSG_ERROR([PYTHON_VERSION ${PYTHON_VERSION} but no matching file in download.lst])
fi
@ -15609,6 +15646,22 @@ else
fi
AC_SUBST(KEEP_AWAKE_CMD)
dnl =========================================
dnl Check for Jom (parallel nmake)
dnl =========================================
if test "$_os" = "WINNT"; then
AC_MSG_CHECKING([for jom (parallel nmake)])
AC_PATH_PROG([JOM], [jom.exe])
if test -z "$JOM"; then
AC_MSG_NOTICE([jom can help accelerate your build, but is completely optional. Get it from https://wiki.qt.io/Jom])
AC_MSG_NOTICE([and put it in PATH or add JOM=/unix/style/path/to/jom.exe to your autogen.input to use it])
else
PathFormat "$JOM"
JOM="$formatted_path"
fi
AC_SUBST(JOM)
fi
dnl ===================================================================
dnl Setting up the environment.
dnl ===================================================================
@ -15788,6 +15841,7 @@ if test -n "$WSL_ONLY_AS_HELPER"; then
WGET=
GNUTAR="tar.exe"
SHA256SUM="sha256sum.exe"
COMPRESSIONTOOL="/usr/bin/gzip"
# TODO: maybe switch to strawberry-perl right away?
# only openssl seems to actually require it (for Pod/Usage.pm and maybe more)
PERL="perl.exe"

5
cui/Library_cui.mk
View file

@ -32,7 +32,7 @@ $(eval $(call gb_Library_use_sdk_api,cui))
$(eval $(call gb_Library_use_libraries,cui,\
$(call gb_Helper_optional,AVMEDIA,avmedia) \
basctl \
$(call gb_Helper_optional,SCRIPTING,basctl) \
basegfx \
comphelper \
cppu \
@ -148,7 +148,8 @@ $(eval $(call gb_Library_add_exception_objects,cui,\
cui/source/dialogs/GraphicTestsDialog \
cui/source/dialogs/ImageViewerDialog \
cui/source/dialogs/scriptdlg \
cui/source/dialogs/MacroManagerDialog \
$(call gb_Helper_optional,SCRIPTING, \
cui/source/dialogs/MacroManagerDialog) \
cui/source/dialogs/SignatureLineDialogBase \
cui/source/dialogs/SignatureLineDialog \
cui/source/dialogs/SignSignatureLineDialog \

1
cui/inc/strings.hrc
View file

@ -421,6 +421,7 @@
#define STR_AVOID_NEWLINES_SPACE NC_("STR_AVOID_NEWLINES_SPACE", "Check if document contains new lines to create space.")
#define STR_AVOID_SPACES_SPACE NC_("STR_AVOID_SPACES_SPACE", "Check if document contains extra spaces to create space.")
#define STR_AVOID_TABS_FORMATTING NC_("STR_AVOID_TABS_FORMATTING", "Check if document contains tabs for formatting.")
#define STR_AVOID_EMPTY_NUM_PARA NC_("STR_AVOID_EMPTY_NUM_PARA", "Check if document contains new empty lines between numbered paragraphs.")
#define STR_HEADINGS_NOT_IN_ORDER NC_("STR_HEADINGS_NOT_IN_ORDER", "Check if the outline levels of all headings are in sequential order.")
#define STR_TEXT_FORMATTING_CONVEYS_MEAN NC_("STR_TEXT_FORMATTING_CONVEYS_MEANING", "Check if the document contains direct formatting.")
#define STR_NON_INTERACTIVE_FORMS NC_("STR_NON_INTERACTIVE_FORMS", "Check if the document contains interactive input fields.")

6
cui/source/dialogs/MacroManagerDialog.cxx
View file

@ -188,7 +188,7 @@ void ScriptContainersListBox::Remove(const weld::TreeIter* pEntryIter, bool bRem
while (m_xTreeView->iter_compare(*xIter, *pEntryIter) != 0)
{
m_xTreeView->copy_iterator(*xIter, *xRemoveIter);
m_xTreeView->iter_previous(*xIter);
(void)m_xTreeView->iter_previous(*xIter);
ScriptContainerInfo* pScriptContainerInfo
= weld::fromId<ScriptContainerInfo*>(m_xTreeView->get_id(*xRemoveIter));
if (pScriptContainerInfo)
@ -1153,7 +1153,7 @@ void MacroManagerDialog::CheckButtons()
}
}
// scripts list box state dependant buttons
// scripts list box state dependent buttons
weld::TreeView& rScriptsTreeView = m_xScriptsListBox->get_widget();
std::unique_ptr<weld::TreeIter> xScriptsSelectedIter = rScriptsTreeView.make_iterator();
if (rScriptsTreeView.n_children()
@ -2156,7 +2156,7 @@ OUString MacroManagerDialog::getListOfChildren(
return result.makeStringAndClear();
}
// modified verson of void SvxScriptOrgDialog::deleteEntry(const weld::TreeIter& rEntry)
// modified version of void SvxScriptOrgDialog::deleteEntry(const weld::TreeIter& rEntry)
// cui/source/dialogs/scriptdlg.cxx
void MacroManagerDialog::ScriptingFrameworkScriptsDeleteEntry(weld::TreeView& rTreeView,
const weld::TreeIter& rEntry)

22
cui/source/factory/dlgfact.cxx
View file

@ -1003,13 +1003,31 @@ VclPtr<AbstractMacroManagerDialog>
AbstractDialogFactory_Impl::CreateMacroManagerDialog(weld::Window* pParent,
const Reference<frame::XFrame>& rxFrame)
{
#if HAVE_FEATURE_SCRIPTING
return VclPtr<AbstractMacroManagerDialog_Impl>::Create(
std::make_shared<MacroManagerDialog>(pParent, rxFrame));
#else
(void)pParent;
(void)rxFrame;
return nullptr;
#endif
}
OUString AbstractMacroManagerDialog_Impl::GetScriptURL() const { return m_xDlg->GetScriptURL(); }
OUString AbstractMacroManagerDialog_Impl::GetScriptURL() const
{
#if HAVE_FEATURE_SCRIPTING
return m_xDlg->GetScriptURL();
#else
return OUString();
#endif
}
void AbstractMacroManagerDialog_Impl::LoadLastUsedMacro() const { m_xDlg->LoadLastUsedMacro(); }
void AbstractMacroManagerDialog_Impl::LoadLastUsedMacro() const
{
#if HAVE_FEATURE_SCRIPTING
m_xDlg->LoadLastUsedMacro();
#endif
}
VclPtr<VclAbstractDialog> AbstractDialogFactory_Impl::CreateSvxScriptOrgDialog(weld::Window* pParent,
const OUString& rLanguage)

4
cui/source/inc/MacroManagerDialog.hxx
View file

@ -151,10 +151,6 @@ public:
{
m_xTreeView->connect_changed(rLink);
}
void set_size_request(int nWidth, int nHeight)
{
m_xTreeView->set_size_request(nWidth, nHeight);
}
weld::TreeView& get_widget() { return *m_xTreeView; }
void ClearAll();

39
cui/source/options/optaccessibility.cxx
View file

@ -37,10 +37,13 @@ namespace
{ u"NoAltOleObj"_ustr, { sfx::AccessibilityIssueID::NO_ALT_OLE, STR_NO_ALT_OLE } },
{ u"NoAltGraphicObj"_ustr, { sfx::AccessibilityIssueID::NO_ALT_GRAPHIC, STR_NO_ALT_GRAPHIC } },
{ u"NoAltShapeObj"_ustr, { sfx::AccessibilityIssueID::NO_ALT_SHAPE, STR_NO_ALT_SHAPE } },
{ u"TextFormattings"_ustr, { sfx::AccessibilityIssueID::TEXT_FORMATTING, STR_AVOID_NEWLINES_SPACE } },
{ u"TableMergeSplit"_ustr, { sfx::AccessibilityIssueID::TABLE_MERGE_SPLIT, STR_TABLE_MERGE_SPLIT } },
{ u"TextNewLines"_ustr, { sfx::AccessibilityIssueID::TEXT_NEW_LINES, STR_AVOID_NEWLINES_SPACE } },
{ u"TextSpaces"_ustr, { sfx::AccessibilityIssueID::TEXT_SPACES, STR_AVOID_SPACES_SPACE } },
{ u"TextTabs"_ustr, { sfx::AccessibilityIssueID::TEXT_TABS, STR_AVOID_TABS_FORMATTING } },
{ u"TextEmptyNums"_ustr, { sfx::AccessibilityIssueID::TEXT_EMPTY_NUM_PARA, STR_AVOID_EMPTY_NUM_PARA } },
{ u"DirectFormattings"_ustr, { sfx::AccessibilityIssueID::DIRECT_FORMATTING, STR_TEXT_FORMATTING_CONVEYS_MEAN } },
{ u"TableFormattings"_ustr, { sfx::AccessibilityIssueID::TABLE_FORMATTING, STR_TABLE_FORMATTING } },
{ u"TableMergeSplit"_ustr, { sfx::AccessibilityIssueID::TABLE_MERGE_SPLIT, STR_TABLE_MERGE_SPLIT } },
{ u"HyperlinkText"_ustr, { sfx::AccessibilityIssueID::HYPERLINK_IS_TEXT, STR_HYPERLINK_TEXT_IS_LINK } },
{ u"HyperlinkShort"_ustr, { sfx::AccessibilityIssueID::HYPERLINK_SHORT, STR_HYPERLINK_TEXT_IS_SHORT } },
{ u"HyperlinkNoName"_ustr, { sfx::AccessibilityIssueID::HYPERLINK_NO_NAME, STR_HYPERLINK_NO_NAME } },
@ -198,8 +201,20 @@ bool SvxAccessibilityOptionsTabPage::FillItemSet( SfxItemSet* )
officecfg::Office::Common::AccessibilityIssues::NoAltShapeObj::set(bChecked, batch);
break;
case sfx::AccessibilityIssueID::TEXT_FORMATTING:
officecfg::Office::Common::AccessibilityIssues::TextFormattings::set(bChecked, batch);
case sfx::AccessibilityIssueID::TEXT_NEW_LINES:
officecfg::Office::Common::AccessibilityIssues::TextNewLines::set(bChecked, batch);
break;
case sfx::AccessibilityIssueID::TEXT_SPACES:
officecfg::Office::Common::AccessibilityIssues::TextSpaces::set(bChecked, batch);
break;
case sfx::AccessibilityIssueID::TEXT_TABS:
officecfg::Office::Common::AccessibilityIssues::TextTabs::set(bChecked, batch);
break;
case sfx::AccessibilityIssueID::TEXT_EMPTY_NUM_PARA:
officecfg::Office::Common::AccessibilityIssues::TextEmptyNums::set(bChecked, batch);
break;
case sfx::AccessibilityIssueID::DIRECT_FORMATTING:
@ -394,8 +409,20 @@ void SvxAccessibilityOptionsTabPage::Reset( const SfxItemSet* )
bChecked = officecfg::Office::Common::AccessibilityIssues::NoAltShapeObj::get();
break;
case sfx::AccessibilityIssueID::TEXT_FORMATTING:
bChecked = officecfg::Office::Common::AccessibilityIssues::TextFormattings::get();
case sfx::AccessibilityIssueID::TEXT_NEW_LINES:
bChecked = officecfg::Office::Common::AccessibilityIssues::TextNewLines::get();
break;
case sfx::AccessibilityIssueID::TEXT_SPACES:
bChecked = officecfg::Office::Common::AccessibilityIssues::TextSpaces::get();
break;
case sfx::AccessibilityIssueID::TEXT_TABS:
bChecked = officecfg::Office::Common::AccessibilityIssues::TextTabs::get();
break;
case sfx::AccessibilityIssueID::TEXT_EMPTY_NUM_PARA:
bChecked = officecfg::Office::Common::AccessibilityIssues::TextEmptyNums::get();
break;
case sfx::AccessibilityIssueID::DIRECT_FORMATTING:

8
cui/source/options/optcolor.cxx
View file

@ -278,9 +278,9 @@ private:
void SetLinks(Link<weld::Toggleable&,void> const&,
Link<ColorListBox&,void> const&,
Link<weld::Widget&,void> const&);
void Update (ColorConfigValue const&, const std::u16string_view&,
void Update (ColorConfigValue const&, std::u16string_view,
css::uno::Reference<css::configuration::XReadWriteAccess> const&);
void Update (ExtendedColorConfigValue const&, const std::u16string_view&,
void Update (ExtendedColorConfigValue const&, std::u16string_view,
css::uno::Reference<css::configuration::XReadWriteAccess> const&);
void ColorChanged (ColorConfigValue&);
void ColorChanged (ExtendedColorConfigValue&);
@ -387,7 +387,7 @@ void ColorConfigWindow_Impl::Entry::SetLinks(Link<weld::Toggleable&,void> const&
}
// updates a default color config entry
void ColorConfigWindow_Impl::Entry::Update(ColorConfigValue const& rValue, const std::u16string_view& rConfigPath,
void ColorConfigWindow_Impl::Entry::Update(ColorConfigValue const& rValue, std::u16string_view rConfigPath,
css::uno::Reference<css::configuration::XReadWriteAccess> const& xReadWriteAccess)
{
Color aColor(rValue.nColor);
@ -418,7 +418,7 @@ void ColorConfigWindow_Impl::Entry::Update(ColorConfigValue const& rValue, const
}
// updates an extended color config entry
void ColorConfigWindow_Impl::Entry::Update(ExtendedColorConfigValue const& rValue, const std::u16string_view& rConfigPath,
void ColorConfigWindow_Impl::Entry::Update(ExtendedColorConfigValue const& rValue, std::u16string_view rConfigPath,
css::uno::Reference<css::configuration::XReadWriteAccess> const& xReadWriteAccess)
{
Color aColor(rValue.getColor());

4
desktop/source/app/updater.cxx
View file

@ -403,9 +403,9 @@ public:
}
};
OUString toOUString(const std::string_view& rStr)
OUString toOUString(std::string_view str)
{
return OUString::fromUtf8(rStr);
return OUString::fromUtf8(str);
}
update_file parse_update_file(orcus::json::node& rNode)

8
download.lst
View file

@ -320,8 +320,8 @@ GLM_TARBALL := glm-1.0.1.zip
# three static lines
# so that git cherry-pick
# will not run into conflicts
GPGME_SHA256SUM := 61e3a6ad89323fecfaff176bc1728fb8c3312f2faa83424d9d5077ba20f5f7da
GPGME_TARBALL := gpgme-1.24.0.tar.bz2
GPGME_SHA256SUM := ea05d0258e71061d61716584ec34cef59330a91340571edc46b78374973ba85f
GPGME_TARBALL := gpgme-1.24.1.tar.bz2
# three static lines
# so that git cherry-pick
# will not run into conflicts
@ -593,8 +593,8 @@ POSTGRESQL_TARBALL := postgresql-14.15.tar.bz2
# three static lines
# so that git cherry-pick
# will not run into conflicts
PYTHON_SHA256SUM := aab0950817735172601879872d937c1e4928a57c409ae02369ec3d91dccebe79
PYTHON_TARBALL := Python-3.10.15.tar.xz
PYTHON_SHA256SUM := bfb249609990220491a1b92850a07135ed0831e41738cf681d63cf01b2a8fbd1
PYTHON_TARBALL := Python-3.10.16.tar.xz
# three static lines
# so that git cherry-pick
# will not run into conflicts

6
editeng/source/accessibility/AccessibleComponentBase.cxx
View file

@ -114,12 +114,6 @@ sal_Int32 SAL_CALL AccessibleComponentBase::getBackground()
// XAccessibleExtendedComponent
css::uno::Reference< css::awt::XFont > SAL_CALL
AccessibleComponentBase::getFont()
{
return uno::Reference<awt::XFont>();
}
OUString SAL_CALL AccessibleComponentBase::getTitledBorderText()
{

4
editeng/source/editeng/editeng.cxx
View file

@ -439,10 +439,10 @@ sal_Int32 EditEngine::GetLineNumberAtIndex( sal_Int32 nPara, sal_Int32 nIndex )
return getImpl().GetLineNumberAtIndex(nPara, nIndex);
}
sal_uInt32 EditEngine::GetLineHeight( sal_Int32 nParagraph )
sal_uInt32 EditEngine::GetLineHeight( sal_Int32 nParagraph, sal_Int32 nLine )
{
// If someone calls GetLineHeight() with an empty Engine.
return getImpl().GetLineHeight( nParagraph, 0 );
return getImpl().GetLineHeight( nParagraph, nLine );
}
tools::Rectangle EditEngine::GetParaBounds( sal_Int32 nPara )

4
editeng/source/outliner/outlin2.cxx
View file

@ -318,9 +318,9 @@ sal_Int32 Outliner::GetLineLen( sal_Int32 nParagraph, sal_Int32 nLine ) const
return pEditEngine->GetLineLen( nParagraph, nLine );
}
sal_uInt32 Outliner::GetLineHeight( sal_Int32 nParagraph )
sal_uInt32 Outliner::GetLineHeight( sal_Int32 nParagraph, sal_Int32 nLine )
{
return pEditEngine->GetLineHeight( nParagraph );
return pEditEngine->GetLineHeight( nParagraph, nLine );
}
void Outliner::RemoveCharAttribs( sal_Int32 nPara, sal_uInt16 nWhich )

11
extensions/source/scanner/sane.cxx
View file

@ -110,8 +110,7 @@ inline oslGenericFunction Sane::LoadSymbol( const char* pSymbolname )
oslGenericFunction pFunction = osl_getAsciiFunctionSymbol( pSaneLib, pSymbolname );
if( ! pFunction )
{
fprintf( stderr, "Could not load symbol %s\n",
pSymbolname );
SAL_WARN( "extensions.scanner", "Could not load symbol " << pSymbolname );
bSaneSymbolLoadFailed = true;
}
return pFunction;
@ -269,11 +268,11 @@ void Sane::ReloadOptions()
SANE_Status nStatus = p_control_option( maHandle, 0, SANE_ACTION_GET_VALUE,
static_cast<void*>(pOptions), nullptr );
if( nStatus != SANE_STATUS_GOOD )
fprintf( stderr, "Error: sane driver returned %s while reading number of options !\n", p_strstatus( nStatus ) );
SAL_WARN( "extensions.scanner", "Error: sane driver returned " << p_strstatus( nStatus ) << " while reading number of options !" );
mnOptions = pOptions[ 0 ];
if( o3tl::make_unsigned(pZero->size) > sizeof( SANE_Word ) )
fprintf( stderr, "driver returned number of options with larger size than SANE_Word!!!\n" );
SAL_WARN( "extensions.scanner", "driver returned number of options with larger size than SANE_Word!!!" );
mppOptions.reset(new const SANE_Option_Descriptor*[ mnOptions ]);
mppOptions[ 0 ] = pZero;
for( int i = 1; i < mnOptions; i++ )
@ -668,7 +667,7 @@ bool Sane::Start( BitmapTransporter& rBitmap )
eType = FrameStyle_Separated;
break;
default:
fprintf( stderr, "Warning: unknown frame style !!!\n" );
SAL_WARN( "extensions.scanner", "Unknown frame style" );
}
bool bSynchronousRead = true;
@ -717,7 +716,7 @@ bool Sane::Start( BitmapTransporter& rBitmap )
tv.tv_sec = 5;
tv.tv_usec = 0;
if( select( fd+1, &fdset, nullptr, nullptr, &tv ) == 0 )
fprintf( stderr, "Timeout on sane_read descriptor\n" );
SAL_WARN( "extensions.scanner", "Timeout on sane_read descriptor" );
}
nLen = 0;
nStatus = p_read( maHandle, pBuffer.get(), BYTE_BUFFER_SIZE, &nLen );

28
external/boost/0001-Add-a-comma-before-ellipsis-in-constexpr_swap.patch.2 vendored Normal file
View file

@ -0,0 +1,28 @@
From 2dfe66886d71b9a341433ea8b6ff225cc07da80b Mon Sep 17 00:00:00 2001
From: Andrey Semashev <andrey.semashev@gmail.com>
Date: Mon, 2 Dec 2024 19:22:20 +0300
Subject: Add a comma before ellipsis in constexpr_swap.
gcc 15 complains that the comma is required before vararg ellipsis.
Fixes https://github.com/boostorg/integer/issues/35.
---
include/boost/integer/common_factor_rt.hpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/boost/integer/common_factor_rt.hpp b/include/boost/integer/common_factor_rt.hpp
index d6765d4..817682f 100644
--- a/include/boost/integer/common_factor_rt.hpp
+++ b/include/boost/integer/common_factor_rt.hpp
@@ -64,7 +64,7 @@ namespace boost {
return a.swap(b);
}
template <class T, class U>
- inline constexpr void constexpr_swap(T&a, U& b...) BOOST_GCD_NOEXCEPT(T)
+ inline constexpr void constexpr_swap(T& a, U& b, ...) BOOST_GCD_NOEXCEPT(T)
{
T t(static_cast<T&&>(a));
a = static_cast<T&&>(b);
--
2.47.1

38
external/boost/0001-Avoid-Wdeprecated-variadic-comma-omission-with-GCC-1.patch.2 vendored Normal file
View file

@ -0,0 +1,38 @@
From aa25af1928cc275537276c1a50e6ba49333a3aec Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <stephan.bergmann@allotropia.de>
Date: Mon, 2 Dec 2024 19:06:25 +0100
Subject: Avoid -Wdeprecated-variadic-comma-omission with GCC 15 trunk
-std=c++26
...since
<https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=cc67d95dc100706ea665e8cce581d59466aba62e>
"c++: Implement C++26 P3176R1 - The Oxford variadic comma"
---
include/boost/move/detail/unique_ptr_meta_utils.hpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/boost/move/detail/unique_ptr_meta_utils.hpp b/include/boost/move/detail/unique_ptr_meta_utils.hpp
index 4c6aeb5..27154e0 100644
--- a/include/boost/move/detail/unique_ptr_meta_utils.hpp
+++ b/include/boost/move/detail/unique_ptr_meta_utils.hpp
@@ -497,7 +497,7 @@ struct is_unary_function_impl<R (*)(T0)>
{ static const bool value = true; };
template <typename R, class T0>
-struct is_unary_function_impl<R (*)(T0...)>
+struct is_unary_function_impl<R (*)(T0, ...)>
{ static const bool value = true; };
#else // BOOST_MOVE_TT_TEST_MSC_FUNC_SIGS
@@ -519,7 +519,7 @@ struct is_unary_function_impl<R (__cdecl*)(T0)>
{ static const bool value = true; };
template <typename R, class T0>
-struct is_unary_function_impl<R (__cdecl*)(T0...)>
+struct is_unary_function_impl<R (__cdecl*)(T0, ...)>
{ static const bool value = true; };
#endif
--
2.47.1

6
external/boost/UnpackedTarball_boost.mk vendored
View file

@ -36,6 +36,12 @@ boost_patches += Wundef.patch.0
boost_patches += boost.spirit.noreturn.patch
boost_patches += 0001-Add-a-comma-before-ellipsis-in-constexpr_swap.patch.2
# Sent upstream as <https://github.com/boostorg/move/pull/58> "Avoid
# -Wdeprecated-variadic-comma-omission with GCC 15 trunk -std=c++26":
boost_patches += 0001-Avoid-Wdeprecated-variadic-comma-omission-with-GCC-1.patch.2
$(eval $(call gb_UnpackedTarball_UnpackedTarball,boost))
$(eval $(call gb_UnpackedTarball_set_tarball,boost,$(BOOST_TARBALL)))

4
external/gpgmepp/ExternalPackage_gpgmepp.mk vendored
View file

@ -15,8 +15,8 @@ ifneq ($(DISABLE_DYNLOADING),TRUE)
ifeq ($(OS),LINUX)
$(eval $(call gb_ExternalPackage_add_file,gpgmepp,$(LIBO_LIB_FOLDER)/libgpgmepp.so.6,lang/cpp/src/.libs/libgpgmepp.so.6.21.0))
$(eval $(call gb_ExternalPackage_add_file,gpgmepp,$(LIBO_LIB_FOLDER)/libgpgme.so.11,src/.libs/libgpgme.so.11.33.0))
$(eval $(call gb_ExternalPackage_add_file,gpgmepp,$(LIBO_LIB_FOLDER)/libgpgmepp.so.6,lang/cpp/src/.libs/libgpgmepp.so.6.21.1))
$(eval $(call gb_ExternalPackage_add_file,gpgmepp,$(LIBO_LIB_FOLDER)/libgpgme.so.11,src/.libs/libgpgme.so.11.33.1))
else ifeq ($(OS),MACOSX)

1
external/gpgmepp/UnpackedTarball_gpgmepp.mk vendored
View file

@ -28,7 +28,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,gpgmepp, \
external/gpgmepp/w32-build-fixes-2.patch \
$(if $(filter LINUX,$(OS)),external/gpgmepp/asan.patch) \
$(if $(filter LINUX,$(OS)),external/gpgmepp/rpath.patch) \
$(if $(filter LINUX,$(OS)),external/gpgmepp/gettid.patch) \
external/gpgmepp/ubsan.patch \
external/gpgmepp/c++20.patch \
external/gpgmepp/clang-cl.patch \

14
external/gpgmepp/gettid.patch vendored
View file

@ -1,14 +0,0 @@
--- src/debug.c 2024-11-08 13:08:06.174085089 +0100
+++ src/debug.c 2024-11-08 13:11:43.133601548 +0100
@@ -152,8 +152,10 @@
#ifdef HAVE_W32_SYSTEM
thread = (uintptr_t)GetCurrentThreadId ();
#elif defined(__linux)
+#ifdef SYS_gettid
thread = (uintptr_t)gettid ();
#endif
+#endif
if (sizeof (thread) < len)
{
int zerolen = len;

3
external/openssl/ExternalProject_openssl.mk vendored
View file

@ -64,11 +64,12 @@ $(eval $(call gb_ExternalProject_use_nmake,openssl,build))
$(call gb_ExternalProject_get_state_target,openssl,build): export PERL:=$(if $(MSYSTEM),$(STRAWBERRY_PERL),$(shell cygpath -m $(PERL)))
# PARALLELISM_OPTION might be -j 16 -l 24, for jom ignore the load limit/only use the job limit
$(call gb_ExternalProject_get_state_target,openssl,build):
$(call gb_Trace_StartRange,openssl,EXTERNAL)
$(call gb_ExternalProject_run,build,\
CONFIGURE_INSIST=1 $(PERL) Configure $(OPENSSL_PLATFORM) no-tests no-multilib \
&& nmake -f makefile \
&& $(if $(JOM),$(JOM) $(wordlist 1,2,$(PARALLELISM_OPTION)),nmake) -f makefile \
$(if $(call gb_Module__symbols_enabled,openssl),DEBUG_FLAGS_VALUE="$(gb_DEBUGINFO_FLAGS)") \
)
$(call gb_Trace_EndRange,openssl,EXTERNAL)

1
external/redland/ExternalProject_raptor.mk vendored
View file

@ -35,6 +35,7 @@ $(call gb_ExternalProject_get_state_target,raptor,build):
$(if $(filter LINUX FREEBSD,$(OS)),$(strip -Wl,-z,origin -Wl,-rpath,\$$$$ORIGIN -Wl,-rpath-link,$(INSTROOT)/$(LIBO_URE_LIB_FOLDER))) \
$(if $(SYSBASE),$(if $(filter LINUX SOLARIS,$(OS)),-L$(SYSBASE)/lib -L$(SYSBASE)/usr/lib -lpthread -ldl)))' \
CPPFLAGS="$(if $(SYSBASE),-I$(SYSBASE)/usr/include) $(gb_EMSCRIPTEN_CPPFLAGS)" \
ICU_LIBS='$(if $(filter-out MACOSX,$(OS)),$(ICU_LIBS))' \
$(gb_RUN_CONFIGURE) ./configure --disable-gtk-doc \
--enable-parsers="rdfxml ntriples turtle trig guess rss-tag-soup" \
--without-www \

11
filter/source/msfilter/eschesdo.cxx
View file

@ -53,7 +53,6 @@ ImplEESdrWriter::ImplEESdrWriter( EscherEx& rEx )
: mpEscherEx(&rEx)
, mpPicStrm(nullptr)
, mpHostAppData(nullptr)
, mbIsTitlePossible(false)
, mpSdrPage( nullptr )
{
}
@ -829,16 +828,9 @@ sal_uInt32 ImplEESdrWriter::ImplEnterAdditionalTextGroup( const Reference< XShap
}
void ImplEESdrWriter::ImplInitPageValues()
{
mbIsTitlePossible = true; // With more than one title PowerPoint will fail.
}
void ImplEESdrWriter::ImplWritePage(
EscherSolverContainer& rSolverContainer, bool ooxmlExport )
{
ImplInitPageValues();
const sal_uInt32 nShapes = mXShapes->getCount();
for( sal_uInt32 n = 0; n < nShapes; ++n )
{
@ -875,7 +867,6 @@ bool ImplEESdrWriter::ImplInitPage( const SdrPage& rPage )
mXShapes = mXDrawPage;
if ( !mXShapes.is() )
return false;
ImplInitPageValues();
mpSdrPage = &rPage;
mpSolverContainer.reset( new EscherSolverContainer );
@ -898,8 +889,6 @@ bool ImplEESdrWriter::ImplInitUnoShapes( const Reference< XShapes >& rxShapes )
mXDrawPage.clear();
mXShapes = rxShapes;
ImplInitPageValues();
mpSolverContainer.reset( new EscherSolverContainer );
return true;
}

2
filter/source/msfilter/eschesdo.hxx
View file

@ -105,11 +105,9 @@ class ImplEESdrWriter
SvStream* mpPicStrm;
// own extensions
EscherExHostAppData* mpHostAppData;
bool mbIsTitlePossible;
const SdrPage* mpSdrPage;
std::unique_ptr<EscherSolverContainer> mpSolverContainer;
void ImplInitPageValues();
void ImplWritePage( EscherSolverContainer& rSolver, bool ooxmlExport );
sal_uInt32 ImplWriteShape( ImplEESdrObject& rObj,
EscherSolverContainer& rSolver,

25
filter/source/msfilter/svdfppt.cxx
View file

@ -4408,32 +4408,11 @@ PPTStyleSheet::~PPTStyleSheet()
}
PPTParaPropSet::PPTParaPropSet()
: mnOriginalTextPos(0)
, mxParaSet( new ImplPPTParaPropSet )
: mxParaSet( new ImplPPTParaPropSet )
{
mxParaSet->mnHasAnm = 1;
}
PPTParaPropSet::PPTParaPropSet( PPTParaPropSet const & rParaPropSet )
{
mxParaSet = rParaPropSet.mxParaSet;
mnOriginalTextPos = rParaPropSet.mnOriginalTextPos;
}
PPTParaPropSet::~PPTParaPropSet()
{
}
PPTParaPropSet& PPTParaPropSet::operator=( const PPTParaPropSet& rParaPropSet )
{
if ( this != &rParaPropSet )
{
mxParaSet = rParaPropSet.mxParaSet;
mnOriginalTextPos = rParaPropSet.mnOriginalTextPos;
}
return *this;
}
PPTCharPropSet::PPTCharPropSet(sal_uInt32 nParagraph)
: mnOriginalTextPos(0)
, mnParagraph(nParagraph)
@ -5069,7 +5048,6 @@ void PPTStyleTextPropReader::ReadParaProps(SvStream& rIn, const DffRecordHeader&
OSL_FAIL( "SJ:PPTStyleTextPropReader::could not get this PPT_PST_StyleTextPropAtom by reading the paragraph attributes" );
}
PPTParaPropSet* pPara = new PPTParaPropSet( aParaPropSet );
pPara->mnOriginalTextPos = nCharReadCnt;
aParaPropList.emplace_back( pPara );
if ( nCharCount )
{
@ -5079,7 +5057,6 @@ void PPTStyleTextPropReader::ReadParaProps(SvStream& rIn, const DffRecordHeader&
if ( pDat[ nCount ] == 0xd )
{
pPara = new PPTParaPropSet( aParaPropSet );
pPara->mnOriginalTextPos = nCharReadCnt + nCount + 1;
aParaPropList.emplace_back( pPara );
}
}

2
filter/source/pdf/pdfexport.cxx
View file

@ -361,7 +361,7 @@ static OUString getMimetypeForDocument( const Reference< XComponentContext >& xC
}
uno::Reference<security::XCertificate>
PDFExport::GetCertificateFromSubjectName(const std::u16string_view& rSubjectName) const
PDFExport::GetCertificateFromSubjectName(std::u16string_view rSubjectName) const
{
uno::Reference<xml::crypto::XSEInitializer> xSEInitializer
= xml::crypto::SEInitializer::create(mxContext);

2
filter/source/pdf/pdfexport.hxx
View file

@ -66,7 +66,7 @@ private:
void ImplWriteWatermark( vcl::PDFWriter& rWriter, const Size& rPageSize );
void ImplWriteTiledWatermark( vcl::PDFWriter& rWriter, const Size& rPageSize );
css::uno::Reference<css::security::XCertificate> GetCertificateFromSubjectName(const std::u16string_view& rSubjectName) const;
css::uno::Reference<css::security::XCertificate> GetCertificateFromSubjectName(std::u16string_view rSubjectName) const;
public:

13
filter/source/svg/svgexport.cxx
View file

@ -1792,11 +1792,6 @@ void SVGFilter::implGetPagePropSet( const Reference< css::drawing::XDrawPage > &
mVisiblePagePropSet.bIsBackgroundVisible = true;
mVisiblePagePropSet.bAreBackgroundObjectsVisible = true;
mVisiblePagePropSet.bIsPageNumberFieldVisible = false;
mVisiblePagePropSet.bIsHeaderFieldVisible = false;
mVisiblePagePropSet.bIsFooterFieldVisible = true;
mVisiblePagePropSet.bIsDateTimeFieldVisible = true;
mVisiblePagePropSet.bIsDateTimeFieldFixed = true;
mVisiblePagePropSet.nDateTimeFormat = SvxDateFormat::B;
mVisiblePagePropSet.nPageNumberingType = css::style::NumberingType::ARABIC;
// We collect info on master page elements visibility, and placeholder text shape content.
@ -1811,14 +1806,6 @@ void SVGFilter::implGetPagePropSet( const Reference< css::drawing::XDrawPage > &
implSafeGetPagePropSet( u"IsBackgroundVisible"_ustr, xPropSet, xPropSetInfo ) >>= mVisiblePagePropSet.bIsBackgroundVisible;
implSafeGetPagePropSet( u"IsBackgroundObjectsVisible"_ustr, xPropSet, xPropSetInfo ) >>= mVisiblePagePropSet.bAreBackgroundObjectsVisible;
implSafeGetPagePropSet( u"IsPageNumberVisible"_ustr, xPropSet, xPropSetInfo ) >>= mVisiblePagePropSet.bIsPageNumberFieldVisible;
implSafeGetPagePropSet( u"IsHeaderVisible"_ustr, xPropSet, xPropSetInfo ) >>= mVisiblePagePropSet.bIsHeaderFieldVisible;
implSafeGetPagePropSet( u"IsFooterVisible"_ustr, xPropSet, xPropSetInfo ) >>= mVisiblePagePropSet.bIsFooterFieldVisible;
implSafeGetPagePropSet( u"IsDateTimeVisible"_ustr, xPropSet, xPropSetInfo ) >>= mVisiblePagePropSet.bIsDateTimeFieldVisible;
implSafeGetPagePropSet( u"IsDateTimeFixed"_ustr, xPropSet, xPropSetInfo ) >>= mVisiblePagePropSet.bIsDateTimeFieldFixed;
sal_Int32 nTmp;
if (implSafeGetPagePropSet( u"DateTimeFormat"_ustr, xPropSet, xPropSetInfo ) >>= nTmp)
mVisiblePagePropSet.nDateTimeFormat = static_cast<SvxDateFormat>(nTmp);
if( mVisiblePagePropSet.bIsPageNumberFieldVisible )
{

10
filter/source/svg/svgfilter.hxx
View file

@ -122,22 +122,12 @@ struct PagePropertySet
bool bIsBackgroundVisible;
bool bAreBackgroundObjectsVisible;
bool bIsPageNumberFieldVisible;
bool bIsDateTimeFieldVisible;
bool bIsFooterFieldVisible;
bool bIsHeaderFieldVisible;
sal_Int32 nPageNumberingType;
bool bIsDateTimeFieldFixed;
SvxDateFormat nDateTimeFormat;
PagePropertySet()
: bIsBackgroundVisible(false)
, bAreBackgroundObjectsVisible(false)
, bIsPageNumberFieldVisible(false)
, bIsDateTimeFieldVisible(false)
, bIsFooterFieldVisible(false)
, bIsHeaderFieldVisible(false)
, nPageNumberingType(0)
, bIsDateTimeFieldFixed(false)
, nDateTimeFormat(SvxDateFormat::AppDefault)
{
}
};

3
filter/source/svg/svgwriter.cxx
View file

@ -1858,7 +1858,6 @@ SVGActionWriter::SVGActionWriter( SVGExport& rExport, SVGFontExport& rFontExport
maAttributeWriter( rExport, rFontExport, mrCurrentState ),
maTextWriter(rExport, maAttributeWriter, *this),
mpVDev(VclPtr<VirtualDevice>::Create()),
mbClipAttrChanged( false ),
mbIsPlaceholderShape( false ),
mpEmbeddedBitmapsMap( nullptr ),
mbIsPreview( false )
@ -4054,8 +4053,6 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
const_cast<MetaAction*>(pAction)->Execute( mpVDev );
const vcl::Region aClipRegion = mpVDev->GetActiveClipRegion();
ImplWriteClipPath( aClipRegion.GetAsPolyPolygon() );
mbClipAttrChanged = true;
}
break;

1
filter/source/svg/svgwriter.hxx
View file

@ -316,7 +316,6 @@ private:
SVGTextWriter maTextWriter;
VclPtr<VirtualDevice> mpVDev;
MapMode maTargetMapMode;
bool mbClipAttrChanged;
bool mbIsPlaceholderShape;
const MetaBitmapActionMap* mpEmbeddedBitmapsMap;
bool mbIsPreview;

27
framework/source/layoutmanager/toolbarlayoutmanager.cxx
View file

@ -43,6 +43,7 @@
#include <vcl/dockingarea.hxx>
#include <vcl/settings.hxx>
#include <vcl/svapp.hxx>
#include <vcl/unohelp.hxx>
#include <sal/log.hxx>
#include <tools/gen.hxx>
@ -1497,7 +1498,7 @@ void ToolbarLayoutManager::implts_setElementData( UIElement& rElement, const uno
xWindow->setPosSize( aPixelPos.X(), aPixelPos.Y(), 0, 0, awt::PosSize::POS );
if( bSetSize )
xWindow->setOutputSize(VCLUnoHelper::ConvertToAWTSize(aSize));
xWindow->setOutputSize(vcl::unohelper::ConvertToAWTSize(aSize));
if ( pWindow )
{
@ -1725,8 +1726,8 @@ awt::Point ToolbarLayoutManager::implts_findNextCascadeFloatingPos()
SolarMutexGuard aGuard;
VclPtr<vcl::Window> pContainerWindow = VCLUnoHelper::GetWindow( xContainerWindow );
if ( pContainerWindow )
aStartPos = VCLUnoHelper::ConvertToAWTPoint(
pContainerWindow->OutputToScreenPixel(VCLUnoHelper::ConvertToVCLPoint(aStartPos)));
aStartPos = vcl::unohelper::ConvertToAWTPoint(
pContainerWindow->OutputToScreenPixel(vcl::unohelper::ConvertToVCLPoint(aStartPos)));
}
// Determine size of top and left docking area
@ -3394,14 +3395,14 @@ awt::DockingData SAL_CALL ToolbarLayoutManager::docking( const awt::DockingEvent
if ( aFloatSize.Width > 0 && aFloatSize.Height > 0 )
{
aUIDockingElement.m_aFloatingData.m_aPos
= VCLUnoHelper::ConvertToAWTPoint(pContainerWindow->ScreenToOutputPixel(
VCLUnoHelper::ConvertToVCLPoint(e.MousePos)));
= vcl::unohelper::ConvertToAWTPoint(pContainerWindow->ScreenToOutputPixel(
vcl::unohelper::ConvertToVCLPoint(e.MousePos)));
aDockingData.TrackingRectangle.Height = aFloatSize.Height;
aDockingData.TrackingRectangle.Width = aFloatSize.Width;
}
else
{
aFloatSize = VCLUnoHelper::ConvertToAWTSize(pToolBox->CalcWindowSizePixel());
aFloatSize = vcl::unohelper::ConvertToAWTSize(pToolBox->CalcWindowSizePixel());
if ( !bIsHorizontal )
{
// Floating toolbars are always horizontal aligned! We have to swap
@ -3417,8 +3418,8 @@ awt::DockingData SAL_CALL ToolbarLayoutManager::docking( const awt::DockingEvent
// For the first time we don't have any data about the floating size of a toolbar.
// We calculate it and store it for later use.
aUIDockingElement.m_aFloatingData.m_aPos
= VCLUnoHelper::ConvertToAWTPoint(pContainerWindow->ScreenToOutputPixel(
VCLUnoHelper::ConvertToVCLPoint(e.MousePos)));
= vcl::unohelper::ConvertToAWTPoint(pContainerWindow->ScreenToOutputPixel(
vcl::unohelper::ConvertToVCLPoint(e.MousePos)));
aUIDockingElement.m_aFloatingData.m_aSize = aFloatSize;
aUIDockingElement.m_aFloatingData.m_nLines = pToolBox->GetFloatingLines();
aUIDockingElement.m_aFloatingData.m_bIsHorizontal = isToolboxHorizontalAligned( pToolBox );
@ -3574,8 +3575,8 @@ sal_Bool SAL_CALL ToolbarLayoutManager::prepareToggleFloatingMode( const lang::E
{
ToolBox* pToolBox = static_cast< ToolBox *>( pWindow.get() );
aUIDockingElement.m_aFloatingData.m_aPos
= VCLUnoHelper::ConvertToAWTPoint(pToolBox->GetPosPixel());
aUIDockingElement.m_aFloatingData.m_aSize = VCLUnoHelper::ConvertToAWTSize(pToolBox->GetOutputSizePixel());
= vcl::unohelper::ConvertToAWTPoint(pToolBox->GetPosPixel());
aUIDockingElement.m_aFloatingData.m_aSize = vcl::unohelper::ConvertToAWTSize(pToolBox->GetOutputSizePixel());
aUIDockingElement.m_aFloatingData.m_nLines = pToolBox->GetFloatingLines();
aUIDockingElement.m_aFloatingData.m_bIsHorizontal = isToolboxHorizontalAligned( pToolBox );
}
@ -3643,9 +3644,9 @@ void SAL_CALL ToolbarLayoutManager::toggleFloatingMode( const lang::EventObject&
if ( !bSetSize )
{
if ( pToolBox )
aUIDockingElement.m_aFloatingData.m_aSize = VCLUnoHelper::ConvertToAWTSize(pToolBox->CalcFloatingWindowSizePixel());
aUIDockingElement.m_aFloatingData.m_aSize = vcl::unohelper::ConvertToAWTSize(pToolBox->CalcFloatingWindowSizePixel());
else if ( pWindow )
aUIDockingElement.m_aFloatingData.m_aSize = VCLUnoHelper::ConvertToAWTSize(pWindow->GetOutputSizePixel());
aUIDockingElement.m_aFloatingData.m_aSize = vcl::unohelper::ConvertToAWTSize(pWindow->GetOutputSizePixel());
}
xWindow->setPosSize( aUIDockingElement.m_aFloatingData.m_aPos.X,
@ -3682,7 +3683,7 @@ void SAL_CALL ToolbarLayoutManager::toggleFloatingMode( const lang::EventObject&
::Size aSize = pToolBox->CalcWindowSizePixel( 1 );
awt::Rectangle aRect = xWindow->getPosSize();
xWindow->setPosSize( aRect.X, aRect.Y, 0, 0, awt::PosSize::POS );
xWindow->setOutputSize(VCLUnoHelper::ConvertToAWTSize(aSize));
xWindow->setOutputSize(vcl::unohelper::ConvertToAWTSize(aSize));
}
}

2
framework/source/uielement/menubarmanager.cxx
View file

@ -115,7 +115,7 @@ Any SAL_CALL MenuBarManager::getMenuHandle( const Sequence< sal_Int8 >& /*Proces
{
SystemMenuData aSystemMenuData;
m_pVCLMenu->GetSystemMenuData( &aSystemMenuData );
m_pVCLMenu->GetSystemMenuData(aSystemMenuData);
#ifdef _WIN32
if( SystemType == SystemDependent::SYSTEM_WIN32 )
{

3
framework/source/uielement/popuptoolbarcontroller.cxx
View file

@ -34,6 +34,7 @@
#include <vcl/menu.hxx>
#include <vcl/svapp.hxx>
#include <vcl/toolbox.hxx>
#include <vcl/unohelp.hxx>
#include <com/sun/star/awt/PopupMenuDirection.hpp>
#include <com/sun/star/awt/XPopupMenu.hpp>
@ -207,7 +208,7 @@ PopupMenuToolbarController::createPopupWindow()
css::uno::Reference< css::awt::XPopupMenu > xPopupMenu ( m_xPopupMenu );
sal_uInt16 nId = xPopupMenu->execute(
css::uno::Reference< css::awt::XWindowPeer >( getParent(), css::uno::UNO_QUERY ),
VCLUnoHelper::ConvertToAWTRect( pToolBox->GetItemRect( m_nToolBoxId ) ),
vcl::unohelper::ConvertToAWTRect( pToolBox->GetItemRect( m_nToolBoxId ) ),
( eAlign == WindowAlign::Top || eAlign == WindowAlign::Bottom ) ?
css::awt::PopupMenuDirection::EXECUTE_DOWN :
css::awt::PopupMenuDirection::EXECUTE_RIGHT );

2
helpcontent2

@ -1 +1 @@
Subproject commit dc50ebde81a0e9266806878b69de81da422ec39c
Subproject commit 0321da3f2b7fca3f7bda1655d64206f28231818e

249
i18npool/qa/cppunit/test_breakiterator.cxx
View file

@ -49,6 +49,7 @@ public:
void testHebrewGereshGershaim();
void testLegacySurrogatePairs();
void testWordCount();
void testDictionaryIteratorLanguages();
CPPUNIT_TEST_SUITE(TestBreakIterator);
CPPUNIT_TEST(testLineBreaking);
@ -70,6 +71,7 @@ public:
CPPUNIT_TEST(testHebrewGereshGershaim);
CPPUNIT_TEST(testLegacySurrogatePairs);
CPPUNIT_TEST(testWordCount);
CPPUNIT_TEST(testDictionaryIteratorLanguages);
CPPUNIT_TEST_SUITE_END();
private:
@ -1612,6 +1614,25 @@ void TestBreakIterator::doTestJapanese(uno::Reference< i18n::XBreakIterator > co
CPPUNIT_ASSERT_EQUAL(sal_Int32(3), aBounds.startPos);
CPPUNIT_ASSERT_EQUAL(sal_Int32(6), aBounds.endPos);
}
{
// tdf#162912: Double-clicking should only select one Basic identifier
static constexpr OUString aTest = u"ThisComponent.CurrentSelection"_ustr;
aBounds = xBreak->getWordBoundary(aTest, 5, aLocale, i18n::WordType::DICTIONARY_WORD, true);
CPPUNIT_ASSERT_EQUAL(sal_Int32(0), aBounds.startPos);
CPPUNIT_ASSERT_EQUAL(sal_Int32(30), aBounds.endPos);
aBounds = xBreak->getWordBoundary(aTest, 5, aLocale,
i18n::WordType::ANYWORD_IGNOREWHITESPACES, true);
CPPUNIT_ASSERT_EQUAL(sal_Int32(0), aBounds.startPos);
CPPUNIT_ASSERT_EQUAL(sal_Int32(13), aBounds.endPos);
aBounds = xBreak->getWordBoundary(aTest, 15, aLocale,
i18n::WordType::ANYWORD_IGNOREWHITESPACES, true);
CPPUNIT_ASSERT_EQUAL(sal_Int32(14), aBounds.startPos);
CPPUNIT_ASSERT_EQUAL(sal_Int32(30), aBounds.endPos);
}
}
void TestBreakIterator::testJapanese()
@ -1914,7 +1935,7 @@ void TestBreakIterator::testWordCount()
const OUString aStr = u"Wordの様にワード数をするのにTest\n植松町"_ustr;
CPPUNIT_ASSERT_EQUAL(7, fnCountWords(aStr, aLocale));
CPPUNIT_ASSERT_EQUAL(8, fnCountWords(aStr, aLocale));
}
// tdf#150621 Korean words should be counted individually, rather than by syllable.
@ -1941,6 +1962,232 @@ void TestBreakIterator::testWordCount()
}
}
void TestBreakIterator::testDictionaryIteratorLanguages()
{
// Thai
{
lang::Locale aLocale{ "th", "TH", "" };
const OUString aStr = u"รอนานหรือเปล่า"_ustr;
i18n::Boundary aBounds;
aBounds
= m_xBreak->getWordBoundary(aStr, 1, aLocale, i18n::WordType::DICTIONARY_WORD, true);
CPPUNIT_ASSERT_EQUAL(sal_Int32(0), aBounds.startPos);
CPPUNIT_ASSERT_EQUAL(sal_Int32(2), aBounds.endPos);
aBounds
= m_xBreak->getWordBoundary(aStr, 3, aLocale, i18n::WordType::DICTIONARY_WORD, true);
CPPUNIT_ASSERT_EQUAL(sal_Int32(2), aBounds.startPos);
CPPUNIT_ASSERT_EQUAL(sal_Int32(5), aBounds.endPos);
aBounds
= m_xBreak->getWordBoundary(aStr, 6, aLocale, i18n::WordType::DICTIONARY_WORD, true);
CPPUNIT_ASSERT_EQUAL(sal_Int32(5), aBounds.startPos);
CPPUNIT_ASSERT_EQUAL(sal_Int32(9), aBounds.endPos);
aBounds
= m_xBreak->getWordBoundary(aStr, 10, aLocale, i18n::WordType::DICTIONARY_WORD, true);
CPPUNIT_ASSERT_EQUAL(sal_Int32(9), aBounds.startPos);
CPPUNIT_ASSERT_EQUAL(sal_Int32(14), aBounds.endPos);
aBounds = m_xBreak->getWordBoundary(aStr, 1, aLocale, i18n::WordType::ANY_WORD, true);
CPPUNIT_ASSERT_EQUAL(sal_Int32(0), aBounds.startPos);
CPPUNIT_ASSERT_EQUAL(sal_Int32(2), aBounds.endPos);
aBounds = m_xBreak->getWordBoundary(aStr, 3, aLocale, i18n::WordType::ANY_WORD, true);
CPPUNIT_ASSERT_EQUAL(sal_Int32(2), aBounds.startPos);
CPPUNIT_ASSERT_EQUAL(sal_Int32(5), aBounds.endPos);
aBounds = m_xBreak->getWordBoundary(aStr, 6, aLocale, i18n::WordType::ANY_WORD, true);
CPPUNIT_ASSERT_EQUAL(sal_Int32(5), aBounds.startPos);
CPPUNIT_ASSERT_EQUAL(sal_Int32(9), aBounds.endPos);
aBounds = m_xBreak->getWordBoundary(aStr, 10, aLocale, i18n::WordType::ANY_WORD, true);
CPPUNIT_ASSERT_EQUAL(sal_Int32(9), aBounds.startPos);
CPPUNIT_ASSERT_EQUAL(sal_Int32(14), aBounds.endPos);
aBounds = m_xBreak->getWordBoundary(aStr, 1, aLocale,
i18n::WordType::ANYWORD_IGNOREWHITESPACES, true);
CPPUNIT_ASSERT_EQUAL(sal_Int32(0), aBounds.startPos);
CPPUNIT_ASSERT_EQUAL(sal_Int32(2), aBounds.endPos);
aBounds = m_xBreak->getWordBoundary(aStr, 3, aLocale,
i18n::WordType::ANYWORD_IGNOREWHITESPACES, true);
CPPUNIT_ASSERT_EQUAL(sal_Int32(2), aBounds.startPos);
CPPUNIT_ASSERT_EQUAL(sal_Int32(5), aBounds.endPos);
aBounds = m_xBreak->getWordBoundary(aStr, 6, aLocale,
i18n::WordType::ANYWORD_IGNOREWHITESPACES, true);
CPPUNIT_ASSERT_EQUAL(sal_Int32(5), aBounds.startPos);
CPPUNIT_ASSERT_EQUAL(sal_Int32(9), aBounds.endPos);
aBounds = m_xBreak->getWordBoundary(aStr, 10, aLocale,
i18n::WordType::ANYWORD_IGNOREWHITESPACES, true);
CPPUNIT_ASSERT_EQUAL(sal_Int32(9), aBounds.startPos);
CPPUNIT_ASSERT_EQUAL(sal_Int32(14), aBounds.endPos);
}
// Japanese
{
lang::Locale aLocale{ "ja", "JP", "" };
const OUString aStr = u"通産省工業技術院北海道"_ustr;
i18n::Boundary aBounds;
aBounds
= m_xBreak->getWordBoundary(aStr, 1, aLocale, i18n::WordType::DICTIONARY_WORD, true);
CPPUNIT_ASSERT_EQUAL(sal_Int32(0), aBounds.startPos);
CPPUNIT_ASSERT_EQUAL(sal_Int32(2), aBounds.endPos);
aBounds
= m_xBreak->getWordBoundary(aStr, 2, aLocale, i18n::WordType::DICTIONARY_WORD, true);
CPPUNIT_ASSERT_EQUAL(sal_Int32(2), aBounds.startPos);
CPPUNIT_ASSERT_EQUAL(sal_Int32(3), aBounds.endPos);
aBounds
= m_xBreak->getWordBoundary(aStr, 4, aLocale, i18n::WordType::DICTIONARY_WORD, true);
CPPUNIT_ASSERT_EQUAL(sal_Int32(3), aBounds.startPos);
CPPUNIT_ASSERT_EQUAL(sal_Int32(5), aBounds.endPos);
aBounds
= m_xBreak->getWordBoundary(aStr, 6, aLocale, i18n::WordType::DICTIONARY_WORD, true);
CPPUNIT_ASSERT_EQUAL(sal_Int32(5), aBounds.startPos);
CPPUNIT_ASSERT_EQUAL(sal_Int32(7), aBounds.endPos);
aBounds
= m_xBreak->getWordBoundary(aStr, 7, aLocale, i18n::WordType::DICTIONARY_WORD, true);
CPPUNIT_ASSERT_EQUAL(sal_Int32(7), aBounds.startPos);
CPPUNIT_ASSERT_EQUAL(sal_Int32(8), aBounds.endPos);
aBounds
= m_xBreak->getWordBoundary(aStr, 9, aLocale, i18n::WordType::DICTIONARY_WORD, true);
CPPUNIT_ASSERT_EQUAL(sal_Int32(8), aBounds.startPos);
CPPUNIT_ASSERT_EQUAL(sal_Int32(11), aBounds.endPos);
aBounds = m_xBreak->getWordBoundary(aStr, 1, aLocale, i18n::WordType::ANY_WORD, true);
CPPUNIT_ASSERT_EQUAL(sal_Int32(0), aBounds.startPos);
CPPUNIT_ASSERT_EQUAL(sal_Int32(2), aBounds.endPos);
aBounds = m_xBreak->getWordBoundary(aStr, 2, aLocale, i18n::WordType::ANY_WORD, true);
CPPUNIT_ASSERT_EQUAL(sal_Int32(2), aBounds.startPos);
CPPUNIT_ASSERT_EQUAL(sal_Int32(3), aBounds.endPos);
aBounds = m_xBreak->getWordBoundary(aStr, 4, aLocale, i18n::WordType::ANY_WORD, true);
CPPUNIT_ASSERT_EQUAL(sal_Int32(3), aBounds.startPos);
CPPUNIT_ASSERT_EQUAL(sal_Int32(5), aBounds.endPos);
aBounds = m_xBreak->getWordBoundary(aStr, 6, aLocale, i18n::WordType::ANY_WORD, true);
CPPUNIT_ASSERT_EQUAL(sal_Int32(5), aBounds.startPos);
CPPUNIT_ASSERT_EQUAL(sal_Int32(7), aBounds.endPos);
aBounds = m_xBreak->getWordBoundary(aStr, 7, aLocale, i18n::WordType::ANY_WORD, true);
CPPUNIT_ASSERT_EQUAL(sal_Int32(7), aBounds.startPos);
CPPUNIT_ASSERT_EQUAL(sal_Int32(8), aBounds.endPos);
aBounds = m_xBreak->getWordBoundary(aStr, 9, aLocale, i18n::WordType::ANY_WORD, true);
CPPUNIT_ASSERT_EQUAL(sal_Int32(8), aBounds.startPos);
CPPUNIT_ASSERT_EQUAL(sal_Int32(11), aBounds.endPos);
aBounds = m_xBreak->getWordBoundary(aStr, 1, aLocale,
i18n::WordType::ANYWORD_IGNOREWHITESPACES, true);
CPPUNIT_ASSERT_EQUAL(sal_Int32(0), aBounds.startPos);
CPPUNIT_ASSERT_EQUAL(sal_Int32(2), aBounds.endPos);
aBounds = m_xBreak->getWordBoundary(aStr, 2, aLocale,
i18n::WordType::ANYWORD_IGNOREWHITESPACES, true);
CPPUNIT_ASSERT_EQUAL(sal_Int32(2), aBounds.startPos);
CPPUNIT_ASSERT_EQUAL(sal_Int32(3), aBounds.endPos);
aBounds = m_xBreak->getWordBoundary(aStr, 4, aLocale,
i18n::WordType::ANYWORD_IGNOREWHITESPACES, true);
CPPUNIT_ASSERT_EQUAL(sal_Int32(3), aBounds.startPos);
CPPUNIT_ASSERT_EQUAL(sal_Int32(5), aBounds.endPos);
aBounds = m_xBreak->getWordBoundary(aStr, 6, aLocale,
i18n::WordType::ANYWORD_IGNOREWHITESPACES, true);
CPPUNIT_ASSERT_EQUAL(sal_Int32(5), aBounds.startPos);
CPPUNIT_ASSERT_EQUAL(sal_Int32(7), aBounds.endPos);
aBounds = m_xBreak->getWordBoundary(aStr, 7, aLocale,
i18n::WordType::ANYWORD_IGNOREWHITESPACES, true);
CPPUNIT_ASSERT_EQUAL(sal_Int32(7), aBounds.startPos);
CPPUNIT_ASSERT_EQUAL(sal_Int32(8), aBounds.endPos);
aBounds = m_xBreak->getWordBoundary(aStr, 9, aLocale,
i18n::WordType::ANYWORD_IGNOREWHITESPACES, true);
CPPUNIT_ASSERT_EQUAL(sal_Int32(8), aBounds.startPos);
CPPUNIT_ASSERT_EQUAL(sal_Int32(11), aBounds.endPos);
}
// Chinese
{
lang::Locale aLocale{ "zh", "CN", "" };
const OUString aStr = u"很高兴认识你"_ustr;
i18n::Boundary aBounds;
aBounds
= m_xBreak->getWordBoundary(aStr, 0, aLocale, i18n::WordType::DICTIONARY_WORD, true);
CPPUNIT_ASSERT_EQUAL(sal_Int32(0), aBounds.startPos);
CPPUNIT_ASSERT_EQUAL(sal_Int32(1), aBounds.endPos);
aBounds
= m_xBreak->getWordBoundary(aStr, 1, aLocale, i18n::WordType::DICTIONARY_WORD, true);
CPPUNIT_ASSERT_EQUAL(sal_Int32(1), aBounds.startPos);
CPPUNIT_ASSERT_EQUAL(sal_Int32(3), aBounds.endPos);
aBounds
= m_xBreak->getWordBoundary(aStr, 3, aLocale, i18n::WordType::DICTIONARY_WORD, true);
CPPUNIT_ASSERT_EQUAL(sal_Int32(3), aBounds.startPos);
CPPUNIT_ASSERT_EQUAL(sal_Int32(5), aBounds.endPos);
aBounds
= m_xBreak->getWordBoundary(aStr, 5, aLocale, i18n::WordType::DICTIONARY_WORD, true);
CPPUNIT_ASSERT_EQUAL(sal_Int32(5), aBounds.startPos);
CPPUNIT_ASSERT_EQUAL(sal_Int32(6), aBounds.endPos);
aBounds = m_xBreak->getWordBoundary(aStr, 0, aLocale, i18n::WordType::ANY_WORD, true);
CPPUNIT_ASSERT_EQUAL(sal_Int32(0), aBounds.startPos);
CPPUNIT_ASSERT_EQUAL(sal_Int32(1), aBounds.endPos);
aBounds = m_xBreak->getWordBoundary(aStr, 1, aLocale, i18n::WordType::ANY_WORD, true);
CPPUNIT_ASSERT_EQUAL(sal_Int32(1), aBounds.startPos);
CPPUNIT_ASSERT_EQUAL(sal_Int32(3), aBounds.endPos);
aBounds = m_xBreak->getWordBoundary(aStr, 3, aLocale, i18n::WordType::ANY_WORD, true);
CPPUNIT_ASSERT_EQUAL(sal_Int32(3), aBounds.startPos);
CPPUNIT_ASSERT_EQUAL(sal_Int32(5), aBounds.endPos);
aBounds = m_xBreak->getWordBoundary(aStr, 5, aLocale, i18n::WordType::ANY_WORD, true);
CPPUNIT_ASSERT_EQUAL(sal_Int32(5), aBounds.startPos);
CPPUNIT_ASSERT_EQUAL(sal_Int32(6), aBounds.endPos);
aBounds = m_xBreak->getWordBoundary(aStr, 0, aLocale,
i18n::WordType::ANYWORD_IGNOREWHITESPACES, true);
CPPUNIT_ASSERT_EQUAL(sal_Int32(0), aBounds.startPos);
CPPUNIT_ASSERT_EQUAL(sal_Int32(1), aBounds.endPos);
aBounds = m_xBreak->getWordBoundary(aStr, 1, aLocale,
i18n::WordType::ANYWORD_IGNOREWHITESPACES, true);
CPPUNIT_ASSERT_EQUAL(sal_Int32(1), aBounds.startPos);
CPPUNIT_ASSERT_EQUAL(sal_Int32(3), aBounds.endPos);
aBounds = m_xBreak->getWordBoundary(aStr, 3, aLocale,
i18n::WordType::ANYWORD_IGNOREWHITESPACES, true);
CPPUNIT_ASSERT_EQUAL(sal_Int32(3), aBounds.startPos);
CPPUNIT_ASSERT_EQUAL(sal_Int32(5), aBounds.endPos);
aBounds = m_xBreak->getWordBoundary(aStr, 5, aLocale,
i18n::WordType::ANYWORD_IGNOREWHITESPACES, true);
CPPUNIT_ASSERT_EQUAL(sal_Int32(5), aBounds.startPos);
CPPUNIT_ASSERT_EQUAL(sal_Int32(6), aBounds.endPos);
}
}
void TestBreakIterator::setUp()
{
BootstrapFixtureBase::setUp();

12
i18npool/source/breakiterator/breakiterator_unicode.cxx
View file

@ -74,16 +74,6 @@ class OOoRuleBasedBreakIterator : public icu::RuleBasedBreakIterator
};
bool locale_requires_dictionary_iterator(const css::lang::Locale& rLocale)
{
return rLocale.Language == "bo" || // Tibetan
rLocale.Language == "dz" || // Dzongkha
rLocale.Language == "ja" || // Japanese
rLocale.Language == "km" || // Khmer
rLocale.Language == "lo" || // Lao
rLocale.Language == "th" || // Thai
rLocale.Language == "zh"; // Chinese
}
}
// loading ICU breakiterator on demand.
@ -189,7 +179,7 @@ void BreakIterator_Unicode::loadICUBreakIterator(const css::lang::Locale& rLocal
rbi.reset();
}
}
else if(!locale_requires_dictionary_iterator(rLocale))
else
{
// language;rule (not langtag, unless we'd actually load such)
OString aLanguage( LanguageTag( rLocale).getLanguage().toUtf8());

BIN
icon-themes/colibre/sc/res/calculator_red.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 448 B

1
icon-themes/colibre_svg/sc/res/calculator_red.svg Normal file
View file

@ -0,0 +1 @@
<svg height="16" viewBox="0 0 16 16" width="16" xmlns="http://www.w3.org/2000/svg"><rect fill="none" height="16" ry="1" stroke="#ff9198" stroke-width="1" width="11" x="2.473253" y=".473253"/><rect fill="none" height="3.01156" ry=".98462" stroke="#ff9198" stroke-width=".98844" width="7.51156" x="4.19422" y="2.19422"/><g fill="#ff9198"><circle cx="5" cy="7.5" r="1"/><circle cx="8" cy="7.5" r="1"/><circle cx="11" cy="7.5" r="1"/><circle cx="5" cy="10.25" r="1"/><circle cx="8" cy="10.25" r="1"/><circle cx="11" cy="10.25" r="1"/><path d="m5.0002116 11.999784a1 1 0 0 0 -1.0004557 1.000456 1 1 0 0 0 1.0004557.999939 1 1 0 0 0 .2930054-.044958c.0630218.028554.1327786.044958.2067057.044958h1.9998779c.073972 0 .1441709-.016371.2072225-.044958a1 1 0 0 0 .2930054.044958 1 1 0 0 0 .9999389-.999939 1 1 0 0 0 -.9999389-1.000456 1 1 0 0 0 -.2930054.044959c-.0630516-.028588-.1332505-.044959-.2072225-.044959h-1.9998779c-.0736821 0-.1433293.016066-.206189.044442a1 1 0 0 0 -.2935221-.044442z"/><circle cx="11" cy="13" r="1"/></g></svg>
Side by side

After

Width:  |  Height:  |  Size: 1 KiB

2
include/drawinglayer/primitive2d/textprimitive2d.hxx
View file

@ -179,7 +179,7 @@ public:
virtual bool hasTextRelief() const;
virtual bool hasShadow() const;
virtual bool hasTextDecoration() const;
virtual bool hasOutline() const;
bool hasOutline() const;
/// compare operator
virtual bool operator==(const BasePrimitive2D& rPrimitive) const override;

1
include/editeng/AccessibleComponentBase.hxx
View file

@ -92,7 +92,6 @@ public:
virtual sal_Int32 SAL_CALL getBackground() override;
//===== XAccessibleExtendedComponent ====================================
virtual css::uno::Reference<css::awt::XFont> SAL_CALL getFont() override;
virtual OUString SAL_CALL getTitledBorderText() override;
virtual OUString SAL_CALL getToolTipText() override;

Some files were not shown because too many files have changed in this diff Show more