[Libreoffice-commits] core.git: solenv/clang-format svx/inc svx/source

[Szabolcs Toth (via logerrit)]

 solenv/clang-format/blacklist    |    1 -
 svx/inc/helpids.h                |    2 --
 svx/source/gallery2/galbrws2.cxx |   14 ++++++--------
 3 files changed, 6 insertions(+), 11 deletions(-)

New commits:
commit 5349e558cf60c6d124fc9a5a4aa41578a3903088
Author:     Szabolcs Toth <szabolcs450 at gmail.com>
AuthorDate: Thu Aug 8 10:44:09 2019 +0200
Commit:     Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
CommitDate: Thu Aug 8 12:46:15 2019 +0200

    tdf#126722 Deleted svxcommands.h file and replaced defines by their values
    
    Change-Id: I9347add59fcd7c8c4bbd08f6190405ad39131046
    Reviewed-on: https://gerrit.libreoffice.org/77143
    Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
    Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>

diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist
index 87e8df93f646..810cb3c121dc 100644
--- a/solenv/clang-format/blacklist
+++ b/solenv/clang-format/blacklist
@@ -7347,7 +7347,6 @@ include/svx/svdview.hxx
 include/svx/svdviter.hxx
 include/svx/svdxcgv.hxx
 include/svx/svx3ditems.hxx
-include/svx/svxcommands.h
 include/svx/svxdlg.hxx
 include/svx/svxdllapi.h
 include/svx/svxerr.hxx
diff --git a/svx/inc/helpids.h b/svx/inc/helpids.h
index c3eead8872ff..c6693c822cea 100644
--- a/svx/inc/helpids.h
+++ b/svx/inc/helpids.h
@@ -19,8 +19,6 @@
 #ifndef INCLUDED_SVX_INC_HELPIDS_H
 #define INCLUDED_SVX_INC_HELPIDS_H
 
-#include <svx/svxcommands.h>
-
 #define HID_BMPMASK_CTL_QCOL_1                                "SVX_HID_BMPMASK_CTL_QCOL_1"
 #define HID_COLOR_CTL_COLORS                                  "SVX_HID_COLOR_CTL_COLORS"
 #define HID_CTRL3D_HSCROLL                                    "SVX_HID_CTRL3D_HSCROLL"
diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx
index f35d4b5c535c..92734278eb85 100644
--- a/svx/source/gallery2/galbrws2.cxx
+++ b/svx/source/gallery2/galbrws2.cxx
@@ -48,8 +48,6 @@
 #include <svx/strings.hrc>
 #include <GalleryControl.hxx>
 #include <bitmaps.hlst>
-
-#include <svx/svxcommands.h>
 #include <svx/galleryitem.hxx>
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/frame/FrameSearchFlag.hpp>
@@ -157,15 +155,15 @@ GalleryThemePopup::GalleryThemePopup(
     // SID_GALLERY_ENABLE_ADDCOPY
     m_aCommandInfo.emplace(
             SID_GALLERY_ENABLE_ADDCOPY,
-            CommandInfo( CMD_SID_GALLERY_ENABLE_ADDCOPY ));
+            CommandInfo( ".uno:GalleryEnableAddCopy" ));
     // SID_GALLERY_BG_BRUSH
     m_aCommandInfo.emplace(
             SID_GALLERY_BG_BRUSH,
-            CommandInfo( CMD_SID_GALLERY_BG_BRUSH ));
+            CommandInfo( ".uno:BackgroundImage" ));
     // SID_GALLERY_FORMATS
     m_aCommandInfo.emplace(
             SID_GALLERY_FORMATS,
-            CommandInfo( CMD_SID_GALLERY_FORMATS ));
+            CommandInfo( ".uno:InsertGalleryPic" ));
 
 }
 
@@ -173,14 +171,14 @@ void SAL_CALL GalleryThemePopup::statusChanged(
     const css::frame::FeatureStateEvent &rEvent )
 {
     const OUString &rURL = rEvent.FeatureURL.Complete;
-    if ( rURL == CMD_SID_GALLERY_ENABLE_ADDCOPY )
+    if ( rURL == ".uno:GalleryEnableAddCopy" )
     {
         if ( !rEvent.IsEnabled )
         {
             mpPopupMenu->EnableItem(mpPopupMenu->GetItemId("add"), false);
         }
     }
-    else if ( rURL == CMD_SID_GALLERY_BG_BRUSH )
+    else if ( rURL == ".uno:BackgroundImage" )
     {
         mpBackgroundPopup->Clear();
         if ( rEvent.IsEnabled )
@@ -1017,7 +1015,7 @@ void GalleryBrowser2::DispatchAdd(
         if ( !xDispatchProvider.is() || !m_xTransformer.is() )
             return;
 
-        aURL.Complete = CMD_SID_GALLERY_FORMATS;
+        aURL.Complete = ".uno:InsertGalleryPic";
         m_xTransformer->parseStrict( aURL );
         xDispatch = xDispatchProvider->queryDispatch(
             aURL,