[Libreoffice-commits] core.git: cui/source cui/util offapi/com offapi/UnoApi_offapi.mk svtools/source

Szymon KÅ‚os (via logerrit) logerrit at kemper.freedesktop.org
Fri Aug 27 15:23:21 UTC 2021


 cui/source/dialogs/colorpicker.cxx                  |    2 +-
 cui/util/cui.component                              |    4 ++--
 offapi/UnoApi_offapi.mk                             |    2 +-
 offapi/com/sun/star/cui/AsynchronousColorPicker.idl |    8 ++++----
 svtools/source/dialogs/colrdlg.cxx                  |    4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

New commits:
commit b4d1bed49e0c262f90e9e3f720dd9816d57d3b99
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Thu Aug 19 15:34:46 2021 +0200
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Fri Aug 27 17:22:42 2021 +0200

    Rename AsyncColorPicker -> AsynchronousColorPicker
    
    Change-Id: If26865ea063df3052e6ba61642fe36f5a1a47929
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120735
    Tested-by: Jenkins
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>

diff --git a/cui/source/dialogs/colorpicker.cxx b/cui/source/dialogs/colorpicker.cxx
index 1ecaa887e206..397e275c663a 100644
--- a/cui/source/dialogs/colorpicker.cxx
+++ b/cui/source/dialogs/colorpicker.cxx
@@ -1286,7 +1286,7 @@ sal_Bool SAL_CALL ColorPicker::supportsService( const OUString& sServiceName )
 Sequence< OUString > SAL_CALL ColorPicker::getSupportedServiceNames(  )
 {
     return { "com.sun.star.ui.dialogs.ColorPicker",
-             "com.sun.star.ui.dialogs.AsyncColorPicker" };
+             "com.sun.star.ui.dialogs.AsynchronousColorPicker" };
 }
 
 // XPropertyAccess
diff --git a/cui/util/cui.component b/cui/util/cui.component
index ae88b06d84bf..1be360dcd6bb 100644
--- a/cui/util/cui.component
+++ b/cui/util/cui.component
@@ -23,8 +23,8 @@
     constructor="com_sun_star_cui_ColorPicker_get_implementation">
     <service name="com.sun.star.ui.dialogs.ColorPicker"/>
   </implementation>
-  <implementation name="com.sun.star.cui.AsyncColorPicker"
+  <implementation name="com.sun.star.cui.AsynchronousColorPicker"
     constructor="com_sun_star_cui_ColorPicker_get_implementation">
-    <service name="com.sun.star.ui.dialogs.AsyncColorPicker"/>
+    <service name="com.sun.star.ui.dialogs.AsynchronousColorPicker"/>
   </implementation>
 </component>
diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index 72591fdbbbf8..46718a5c2fa2 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -100,7 +100,7 @@ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,com/sun/star/configuration,\
     theDefaultProvider \
 ))
 $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,com/sun/star/cui,\
-    AsyncColorPicker \
+    AsynchronousColorPicker \
     ColorPicker \
 ))
 $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,com/sun/star/datatransfer,\
diff --git a/offapi/com/sun/star/cui/AsyncColorPicker.idl b/offapi/com/sun/star/cui/AsynchronousColorPicker.idl
similarity index 83%
rename from offapi/com/sun/star/cui/AsyncColorPicker.idl
rename to offapi/com/sun/star/cui/AsynchronousColorPicker.idl
index a4f8c28d9b3e..1fb8f195c6db 100644
--- a/offapi/com/sun/star/cui/AsyncColorPicker.idl
+++ b/offapi/com/sun/star/cui/AsynchronousColorPicker.idl
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef __com_sun_star_cui_AsyncColorPicker_idl__
-#define __com_sun_star_cui_AsyncColorPicker_idl__
+#ifndef __com_sun_star_cui_AsynchronousColorPicker_idl__
+#define __com_sun_star_cui_AsynchronousColorPicker_idl__
 
 #include <com/sun/star/ui/dialogs/XAsynchronousExecutableDialog.idl>
 #include <com/sun/star/awt/XWindow.idl>
@@ -26,9 +26,9 @@
 module com { module sun { module star { module cui {
 
 /**
-    @since LibreOffice 7.2
+    @since LibreOffice 7.3
  */
-service AsyncColorPicker : com::sun::star::ui::dialogs::XAsynchronousExecutableDialog
+service AsynchronousColorPicker : com::sun::star::ui::dialogs::XAsynchronousExecutableDialog
 {
     createWithParent([in] com::sun::star::awt::XWindow Parent);
 };
diff --git a/svtools/source/dialogs/colrdlg.cxx b/svtools/source/dialogs/colrdlg.cxx
index d913ef87c2e9..e1966ae382bd 100644
--- a/svtools/source/dialogs/colrdlg.cxx
+++ b/svtools/source/dialogs/colrdlg.cxx
@@ -22,7 +22,7 @@
 #include <com/sun/star/beans/XPropertyAccess.hpp>
 #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
 #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
-#include <com/sun/star/cui/AsyncColorPicker.hpp>
+#include <com/sun/star/cui/AsynchronousColorPicker.hpp>
 #include <com/sun/star/cui/ColorPicker.hpp>
 
 #include <comphelper/processfactory.hxx>
@@ -113,7 +113,7 @@ void SvColorDialog::ExecuteAsync(weld::Window* pParent, const std::function<void
         if (pParent)
             xParent = pParent->GetXWindow();
 
-        mxDialog = css::cui::AsyncColorPicker::createWithParent(xContext, xParent);
+        mxDialog = css::cui::AsynchronousColorPicker::createWithParent(xContext, xParent);
         Reference< XPropertyAccess > xPropertyAccess( mxDialog, UNO_QUERY_THROW );
 
         Sequence< PropertyValue > props( 2 );


More information about the Libreoffice-commits mailing list