slidecopy: separate resource ID number circles for svl and svtools (thanks to MBA for the patch)

3 files changed, 7 insertions, 9 deletions

diff --git a/svtools/source/toolpanel/paneltabbar.cxx b/svtools/source/toolpanel/paneltabbar.cxx
index 95e6caa311e4..38aee00c8f55 100755
--- a/svtools/source/toolpanel/paneltabbar.cxx
+++ b/svtools/source/toolpanel/paneltabbar.cxx
@@ -29,6 +29,7 @@
 #include "svtools/toolpanel/paneltabbar.hxx"
 #include "svtools/toolpanel/toolpaneldeck.hxx"
 #include "svtools/svtdata.hxx"
+#include "svtools/svtools.hrc"
 
 #include "tabitemdescriptor.hxx"
 #include "paneltabbarpeer.hxx"
@@ -38,7 +39,6 @@
 #include <vcl/help.hxx>
 #include <vcl/virdev.hxx>
 #include <tools/diagnose_ex.h>
-#include <svl/svtools.hrc>
 
 #include <boost/optional.hpp>
 #include <vector>
@@ -528,13 +528,13 @@ namespace svt
         m_aScrollBack.SetSymbol( IsVertical() ? SYMBOL_ARROW_UP : SYMBOL_ARROW_LEFT );
         m_aScrollBack.Show();
         m_aScrollBack.SetClickHdl( LINK( this, PanelTabBar_Impl, OnScroll ) );
-        m_aScrollBack.SetAccessibleDescription( String( SvtResId( STR_SVT_ACC_BEGIN + 0 ) ) );
+        m_aScrollBack.SetAccessibleDescription( String( SvtResId( STR_SVT_TOOL_PANEL_BUTTON_FWD ) ) );
         m_aScrollBack.SetAccessibleName( m_aScrollBack.GetAccessibleDescription() );
 
         m_aScrollForward.SetSymbol( IsVertical() ? SYMBOL_ARROW_DOWN : SYMBOL_ARROW_RIGHT );
         m_aScrollForward.Show();
         m_aScrollForward.SetClickHdl( LINK( this, PanelTabBar_Impl, OnScroll ) );
-        m_aScrollForward.SetAccessibleDescription( String( SvtResId( STR_SVT_ACC_BEGIN + 1 ) ) );
+        m_aScrollForward.SetAccessibleDescription( String( SvtResId( STR_SVT_TOOL_PANEL_BUTTON_BACK ) ) );
         m_aScrollForward.SetAccessibleName( m_aScrollForward.GetAccessibleDescription() );
     }
 
diff --git a/svtools/source/toolpanel/toolpanel.src b/svtools/source/toolpanel/toolpanel.src
index 0cbc3ea5896d..5908a8fbcf98 100644
--- a/svtools/source/toolpanel/toolpanel.src
+++ b/svtools/source/toolpanel/toolpanel.src
@@ -24,16 +24,14 @@
  *
  ************************************************************************/
 
-#include <svl/svtools.hrc>
+#include "svtools/svtools.hrc"
 
-// the following string ID is a hack, until MBA's promised patch appears, which splits svl/svtools.hrc
-// into two files, one for svl, one or svtools
-String STR_SVT_ACC_BEGIN + 0
+String STR_SVT_TOOL_PANEL_BUTTON_FWD
 {
     Text [ en-US ] = "Tab Panel Scroll Button, backward";
 };
 
-String STR_SVT_ACC_BEGIN + 1
+String STR_SVT_TOOL_PANEL_BUTTON_BACK
 {
     Text [ en-US ] = "Tab Panel Scroll Button, forward";
 };
diff --git a/svtools/source/toolpanel/toolpaneldrawer.cxx b/svtools/source/toolpanel/toolpaneldrawer.cxx
index 66a0a1491d19..e9a12de762b1 100644
--- a/svtools/source/toolpanel/toolpaneldrawer.cxx
+++ b/svtools/source/toolpanel/toolpaneldrawer.cxx
@@ -29,10 +29,10 @@
 #include "toolpaneldrawer.hxx"
 #include "toolpaneldrawerpeer.hxx"
 #include "svtools/svtdata.hxx"
+#include "svtools/svtools.hrc"
 
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
 
-#include <svl/svtools.hrc>
 #include <vcl/lineinfo.hxx>
 #include <vcl/image.hxx>
 #include <vcl/svapp.hxx>