accessibility/Library_acc.mk | 1 -
accessibility/inc/pch/precompiled_acc.hxx | 4 ++--
accessibility/source/standard/vclxaccessiblebox.cxx | 3 ++-
accessibility/source/standard/vclxaccessiblebutton.cxx | 2 +-
accessibility/source/standard/vclxaccessiblemenuitem.cxx | 4 ++--
accessibility/source/standard/vclxaccessibleradiobutton.cxx | 2 +-
accessibility/source/standard/vclxaccessiblescrollbar.cxx | 2 +-
accessibility/source/standard/vclxaccessiblestatusbaritem.cxx | 2 +-
accessibility/source/standard/vclxaccessibletabpage.cxx | 2 +-
accessibility/source/standard/vclxaccessibletextcomponent.cxx | 2 +-
accessibility/source/standard/vclxaccessibletoolboxitem.cxx | 2 +-
include/vcl/accessibility/characterattributeshelper.hxx | 3 ++-
include/vcl/accessibility/strings.hxx | 1 -
solenv/clang-format/excludelist | 3 +--
vcl/Library_vcl.mk | 1 +
vcl/source/accessibility/characterattributeshelper.cxx | 2 +-
16 files changed, 18 insertions(+), 18 deletions(-)
New commits:
commit 2449571a3ed5f0f5daeb60db6e740a5d830afa4a
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Wed Dec 4 12:04:01 2024 +0100
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Wed Dec 4 20:47:04 2024 +0100
a11y: Move action string header to vcl
... so these constants can be reused in vcl.
See commit message of
Change-Id: I6aeee104f271c804c85727002822b89a9263628f
Author: Michael Weghorn <m.wegh...@posteo.de>
Date: Wed Dec 4 11:45:44 2024 +0100
a11y: Move CharacterAttributeshelper from accessibility to vcl
for motivation.
Change-Id: I1552c0a0111c81643ab9bb6f202c8a31662251d9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/177811
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/accessibility/inc/pch/precompiled_acc.hxx
b/accessibility/inc/pch/precompiled_acc.hxx
index 1bc2832a650f..7919e40b3c08 100644
--- a/accessibility/inc/pch/precompiled_acc.hxx
+++ b/accessibility/inc/pch/precompiled_acc.hxx
@@ -342,7 +342,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: */
diff --git a/accessibility/source/standard/vclxaccessiblebox.cxx
b/accessibility/source/standard/vclxaccessiblebox.cxx
index 9e8569ce0826..9690eff35ee2 100644
--- a/accessibility/source/standard/vclxaccessiblebox.cxx
+++ b/accessibility/source/standard/vclxaccessiblebox.cxx
@@ -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;
diff --git a/accessibility/source/standard/vclxaccessiblebutton.cxx
b/accessibility/source/standard/vclxaccessiblebutton.cxx
index 7ede9e02c808..56f30c3d2148 100644
--- a/accessibility/source/standard/vclxaccessiblebutton.cxx
+++ b/accessibility/source/standard/vclxaccessiblebutton.cxx
@@ -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>
diff --git a/accessibility/source/standard/vclxaccessiblemenuitem.cxx
b/accessibility/source/standard/vclxaccessiblemenuitem.cxx
index b48d35ad7637..ef092d25b79a 100644
--- a/accessibility/source/standard/vclxaccessiblemenuitem.cxx
+++ b/accessibility/source/standard/vclxaccessiblemenuitem.cxx
@@ -31,13 +31,13 @@
#include <i18nlangtag/languagetag.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <vcl/accessibility/characterattributeshelper.hxx>
+#include <vcl/accessibility/strings.hxx>
#include <vcl/event.hxx>
#include <vcl/svapp.hxx>
#include <vcl/window.hxx>
#include <vcl/menu.hxx>
#include <vcl/unohelp2.hxx>
#include <vcl/settings.hxx>
-#include <strings.hxx>
using namespace ::com::sun::star::accessibility;
using namespace ::com::sun::star::uno;
diff --git a/accessibility/source/standard/vclxaccessibleradiobutton.cxx
b/accessibility/source/standard/vclxaccessibleradiobutton.cxx
index 3e1cd085fdfb..03d12bb3ffc0 100644
--- a/accessibility/source/standard/vclxaccessibleradiobutton.cxx
+++ b/accessibility/source/standard/vclxaccessibleradiobutton.cxx
@@ -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;
diff --git a/accessibility/source/standard/vclxaccessiblescrollbar.cxx
b/accessibility/source/standard/vclxaccessiblescrollbar.cxx
index 7ffc11da3390..cc58f17efa06 100644
--- a/accessibility/source/standard/vclxaccessiblescrollbar.cxx
+++ b/accessibility/source/standard/vclxaccessiblescrollbar.cxx
@@ -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;
diff --git a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
index b7e31f3bd1be..ac37733db0ea 100644
--- a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
+++ b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
@@ -31,13 +31,13 @@
#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/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>
diff --git a/accessibility/inc/strings.hxx
b/include/vcl/accessibility/strings.hxx
similarity index 99%
rename from accessibility/inc/strings.hxx
rename to include/vcl/accessibility/strings.hxx
index 6fd402a9ba06..720252140418 100644
--- a/accessibility/inc/strings.hxx
+++ b/include/vcl/accessibility/strings.hxx
@@ -19,5 +19,4 @@ inline constexpr OUString RID_STR_ACC_ACTION_DECLINE =
u"decrementLine"_ustr;
inline constexpr OUString RID_STR_ACC_ACTION_INCBLOCK = u"incrementBlock"_ustr;
inline constexpr OUString RID_STR_ACC_ACTION_DECBLOCK = u"decrementBlock"_ustr;
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s
cinkeys+=0=break: */
diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist
index 2e50309b96d6..acffbef29a58 100644
--- a/solenv/clang-format/excludelist
+++ b/solenv/clang-format/excludelist
@@ -70,7 +70,6 @@ accessibility/inc/standard/vclxaccessibletextcomponent.hxx
accessibility/inc/standard/vclxaccessibletextfield.hxx
accessibility/inc/standard/vclxaccessibletoolbox.hxx
accessibility/inc/standard/vclxaccessibletoolboxitem.hxx
-accessibility/inc/strings.hxx
accessibility/source/extended/AccessibleBrowseBox.cxx
accessibility/source/extended/AccessibleBrowseBoxBase.cxx
accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx
commit b28f16520bff4a8bd8b09661f7393a4d91a853f5
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Wed Dec 4 11:45:44 2024 +0100
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Wed Dec 4 20:46:50 2024 +0100
a11y: Move CharacterAttributeshelper from accessibility to vcl
This is in preparation of moving more from
the accessibility module to vcl.
Currently, the a11y implementations for vcl widgets
are implemented in the accessibility module (in
directory of the same name), which in turn depends
on the toolkit module.
To break the dependency cycle (vcl needs accessibility
to create a11y objects for its widgets), there's a UNO
service.
At least some a11y classes don't really need toolkit,
however, so the plan is to decouple this and move those
from the accessibility module into vcl in upcoming
commits.
Change-Id: I6aeee104f271c804c85727002822b89a9263628f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/177810
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
Tested-by: Jenkins
diff --git a/accessibility/Library_acc.mk b/accessibility/Library_acc.mk
index 1382e00019fa..7080203fccaf 100644
--- a/accessibility/Library_acc.mk
+++ b/accessibility/Library_acc.mk
@@ -71,7 +71,6 @@ $(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 \
diff --git a/accessibility/inc/pch/precompiled_acc.hxx
b/accessibility/inc/pch/precompiled_acc.hxx
index 885d43ce436f..1bc2832a650f 100644
--- a/accessibility/inc/pch/precompiled_acc.hxx
+++ b/accessibility/inc/pch/precompiled_acc.hxx
@@ -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>
diff --git a/accessibility/source/standard/vclxaccessiblemenuitem.cxx
b/accessibility/source/standard/vclxaccessiblemenuitem.cxx
index b505920aed93..b48d35ad7637 100644
--- a/accessibility/source/standard/vclxaccessiblemenuitem.cxx
+++ b/accessibility/source/standard/vclxaccessiblemenuitem.cxx
@@ -18,7 +18,6 @@
*/
#include <standard/vclxaccessiblemenuitem.hxx>
-#include <helper/characterattributeshelper.hxx>
#include <comphelper/accessiblecontexthelper.hxx>
#include <comphelper/accessiblekeybindinghelper.hxx>
#include <com/sun/star/awt/KeyModifier.hpp>
@@ -31,6 +30,7 @@
#include <comphelper/sequence.hxx>
#include <i18nlangtag/languagetag.hxx>
#include <toolkit/helper/vclunohelper.hxx>
+#include <vcl/accessibility/characterattributeshelper.hxx>
#include <vcl/event.hxx>
#include <vcl/svapp.hxx>
#include <vcl/window.hxx>
diff --git a/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx
b/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx
index b309d6c39c9d..f47cffd1b148 100644
--- a/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx
+++ b/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx
@@ -19,7 +19,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,6 +29,7 @@
#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/unohelp2.hxx>
diff --git a/accessibility/source/standard/vclxaccessibletabpage.cxx
b/accessibility/source/standard/vclxaccessibletabpage.cxx
index 9c1b2d3db303..90cd8807170c 100644
--- a/accessibility/source/standard/vclxaccessibletabpage.cxx
+++ b/accessibility/source/standard/vclxaccessibletabpage.cxx
@@ -19,7 +19,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,6 +29,7 @@
#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/unohelp2.hxx>
diff --git a/accessibility/source/standard/vclxaccessibletextcomponent.cxx
b/accessibility/source/standard/vclxaccessibletextcomponent.cxx
index 8085759cc948..0c38f6f522c7 100644
--- a/accessibility/source/standard/vclxaccessibletextcomponent.cxx
+++ b/accessibility/source/standard/vclxaccessibletextcomponent.cxx
@@ -19,13 +19,13 @@
#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>
diff --git a/accessibility/inc/helper/characterattributeshelper.hxx
b/include/vcl/accessibility/characterattributeshelper.hxx
similarity index 95%
rename from accessibility/inc/helper/characterattributeshelper.hxx
rename to include/vcl/accessibility/characterattributeshelper.hxx
index a73ee76c09f2..2e58761ea27e 100644
--- a/accessibility/inc/helper/characterattributeshelper.hxx
+++ b/include/vcl/accessibility/characterattributeshelper.hxx
@@ -21,12 +21,13 @@
#include <com/sun/star/uno/Sequence.hxx>
#include <com/sun/star/beans/PropertyValue.hpp>
+#include <vcl/dllapi.h>
#include <vcl/font.hxx>
#include <map>
#include <vector>
-class CharacterAttributesHelper
+class VCL_DLLPUBLIC CharacterAttributesHelper
{
private:
typedef std::map<OUString, css::uno::Any> AttributeMap;
diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist
index 6eff59432b41..2e50309b96d6 100644
--- a/solenv/clang-format/excludelist
+++ b/solenv/clang-format/excludelist
@@ -100,7 +100,6 @@ accessibility/source/extended/accessibletablistbox.cxx
accessibility/source/extended/accessibletablistboxtable.cxx
accessibility/source/extended/textwindowaccessibility.cxx
accessibility/source/helper/acc_factory.cxx
-accessibility/source/helper/characterattributeshelper.cxx
accessibility/source/standard/accessiblemenubasecomponent.cxx
accessibility/source/standard/accessiblemenucomponent.cxx
accessibility/source/standard/accessiblemenuitemcomponent.cxx
@@ -14523,6 +14522,7 @@ vcl/quartz/salgdi.cxx
vcl/quartz/salgdicommon.cxx
vcl/quartz/salvd.cxx
vcl/quartz/utils.cxx
+vcl/source/accessibility/characterattributeshelper.cxx
vcl/source/animate/AnimationRenderer.cxx
vcl/source/app/IconThemeInfo.cxx
vcl/source/app/IconThemeScanner.cxx
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 8f2e7ccf35df..ae12cf9cfda7 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -98,6 +98,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
vcl/source/rendercontext/drawmode \
vcl/skia/SkiaHelper \
vcl/source/accessibility/AccessibleTextAttributeHelper \
+ vcl/source/accessibility/characterattributeshelper \
vcl/source/animate/Animation \
vcl/source/animate/AnimationFrame \
vcl/source/animate/AnimationRenderer \
diff --git a/accessibility/source/helper/characterattributeshelper.cxx
b/vcl/source/accessibility/characterattributeshelper.cxx
similarity index 98%
rename from accessibility/source/helper/characterattributeshelper.cxx
rename to vcl/source/accessibility/characterattributeshelper.cxx
index 7e2a2334bf57..e01d2d8625f5 100644
--- a/accessibility/source/helper/characterattributeshelper.cxx
+++ b/vcl/source/accessibility/characterattributeshelper.cxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <helper/characterattributeshelper.hxx>
#include <tools/gen.hxx>
+#include <vcl/accessibility/characterattributeshelper.hxx>
#include <vcl/unohelp.hxx>
#include <comphelper/sequence.hxx>
