untranslated strings are just strings

Change-Id: Ic7247a6d0e702572ca304bb048bfabfafcbf7505

9 files changed, 39 insertions, 57 deletions

diff --git a/accessibility/inc/helper/accessiblestrings.hrc b/accessibility/inc/helper/accessiblestrings.hrc
index 780e0b583c8d..2af826891527 100644
--- a/accessibility/inc/helper/accessiblestrings.hrc
+++ b/accessibility/inc/helper/accessiblestrings.hrc
@@ -22,15 +22,6 @@
 
 #define RID_TK_ACC_START        1000
 
-// Accessible Action Id's
-#define RID_STR_ACC_ACTION_CLICK            ( RID_TK_ACC_START +    0 )
-#define RID_STR_ACC_ACTION_TOGGLEPOPUP      ( RID_TK_ACC_START +    1 )
-#define RID_STR_ACC_ACTION_SELECT           ( RID_TK_ACC_START +    2 )
-#define RID_STR_ACC_ACTION_INCLINE          ( RID_TK_ACC_START +    3 )
-#define RID_STR_ACC_ACTION_DECLINE          ( RID_TK_ACC_START +    4 )
-#define RID_STR_ACC_ACTION_INCBLOCK         ( RID_TK_ACC_START +    5 )
-#define RID_STR_ACC_ACTION_DECBLOCK         ( RID_TK_ACC_START +    6 )
-
 #define STR_SVT_ACC_ACTION_EXPAND           ( RID_TK_ACC_START +    8 )
 #define STR_SVT_ACC_ACTION_COLLAPSE         ( RID_TK_ACC_START +    9 )
 #define STR_SVT_ACC_LISTENTRY_SELCTED_STATE ( RID_TK_ACC_START +   10 )
diff --git a/accessibility/inc/strings.hxx b/accessibility/inc/strings.hxx
new file mode 100644
index 000000000000..1cee9d65a920
--- /dev/null
+++ b/accessibility/inc/strings.hxx
@@ -0,0 +1,23 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef INCLUDED_ACCESSIBILITY_INC_STRINGS_HRC
+#define INCLUDED_ACCESSIBILITY_INC_STRINGS_HRC
+
+#define RID_STR_ACC_ACTION_CLICK        "press"
+#define RID_STR_ACC_ACTION_TOGGLEPOPUP  "togglePopup"
+#define RID_STR_ACC_ACTION_SELECT       "select"
+#define RID_STR_ACC_ACTION_INCLINE      "incrementLine"
+#define RID_STR_ACC_ACTION_DECLINE      "decrementLine"
+#define RID_STR_ACC_ACTION_INCBLOCK     "incrementBlock"
+#define RID_STR_ACC_ACTION_DECBLOCK     "decrementBlock"
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/accessibility/source/helper/accessiblestrings.src b/accessibility/source/helper/accessiblestrings.src
index 82806565d8b7..127c336ff1b8 100644
--- a/accessibility/source/helper/accessiblestrings.src
+++ b/accessibility/source/helper/accessiblestrings.src
@@ -19,41 +19,6 @@
 
 #include <helper/accessiblestrings.hrc>
 
-String RID_STR_ACC_ACTION_CLICK
-{
-    Text = "press";
-};
-
-String RID_STR_ACC_ACTION_TOGGLEPOPUP
-{
-    Text = "togglePopup";
-};
-
-String RID_STR_ACC_ACTION_SELECT
-{
-    Text = "select";
-};
-
-String RID_STR_ACC_ACTION_INCLINE
-{
-    Text = "incrementLine";
-};
-
-String RID_STR_ACC_ACTION_DECLINE
-{
-    Text = "decrementLine";
-};
-
-String RID_STR_ACC_ACTION_INCBLOCK
-{
-    Text = "incrementBlock";
-};
-
-String RID_STR_ACC_ACTION_DECBLOCK
-{
-    Text = "decrementBlock";
-};
-
 String RID_STR_ACC_NAME_BROWSEBUTTON
 {
     Text [ en-US ] = "Browse";
diff --git a/accessibility/source/standard/vclxaccessiblebox.cxx b/accessibility/source/standard/vclxaccessiblebox.cxx
index 32511a70eb81..f5bc0d5659d4 100644
--- a/accessibility/source/standard/vclxaccessiblebox.cxx
+++ b/accessibility/source/standard/vclxaccessiblebox.cxx
@@ -33,6 +33,7 @@
 #include <vcl/lstbox.hxx>
 #include <helper/accresmgr.hxx>
 #include <helper/accessiblestrings.hrc>
+#include "strings.hxx"
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
@@ -422,7 +423,7 @@ OUString SAL_CALL VCLXAccessibleBox::getAccessibleActionDescription (sal_Int32 n
         throw css::lang::IndexOutOfBoundsException();
 
     if (m_bIsDropDownBox)
-        return TK_RES_STRING(RID_STR_ACC_ACTION_TOGGLEPOPUP);
+        return OUString(RID_STR_ACC_ACTION_TOGGLEPOPUP);
 
     return OUString();
 }
diff --git a/accessibility/source/standard/vclxaccessiblebutton.cxx b/accessibility/source/standard/vclxaccessiblebutton.cxx
index f644262a77ba..5a16d8e50be6 100644
--- a/accessibility/source/standard/vclxaccessiblebutton.cxx
+++ b/accessibility/source/standard/vclxaccessiblebutton.cxx
@@ -29,6 +29,7 @@
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <cppuhelper/typeprovider.hxx>
 #include <comphelper/sequence.hxx>
+#include "strings.hxx"
 
 #include <vcl/button.hxx>
 
@@ -204,7 +205,7 @@ OUString VCLXAccessibleButton::getAccessibleActionDescription ( sal_Int32 nIndex
     if ( nIndex < 0 || nIndex >= getAccessibleActionCount() )
         throw IndexOutOfBoundsException();
 
-    return OUString( TK_RES_STRING( RID_STR_ACC_ACTION_CLICK ) );
+    return OUString(RID_STR_ACC_ACTION_CLICK);
 }
 
 
diff --git a/accessibility/source/standard/vclxaccessiblemenuitem.cxx b/accessibility/source/standard/vclxaccessiblemenuitem.cxx
index 7436716dedf8..9db5a5357b00 100644
--- a/accessibility/source/standard/vclxaccessiblemenuitem.cxx
+++ b/accessibility/source/standard/vclxaccessiblemenuitem.cxx
@@ -37,6 +37,7 @@
 #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;
@@ -424,7 +425,7 @@ OUString VCLXAccessibleMenuItem::getAccessibleActionDescription ( sal_Int32 nInd
     if ( nIndex < 0 || nIndex >= getAccessibleActionCount() )
         throw IndexOutOfBoundsException();
 
-    return TK_RES_STRING( RID_STR_ACC_ACTION_SELECT );
+    return OUString(RID_STR_ACC_ACTION_SELECT);
 }
 
 
diff --git a/accessibility/source/standard/vclxaccessibleradiobutton.cxx b/accessibility/source/standard/vclxaccessibleradiobutton.cxx
index 2064365cd834..576f03fb75df 100644
--- a/accessibility/source/standard/vclxaccessibleradiobutton.cxx
+++ b/accessibility/source/standard/vclxaccessibleradiobutton.cxx
@@ -35,7 +35,7 @@
 #include <comphelper/sequence.hxx>
 #include <vcl/window.hxx>
 #include <vcl/button.hxx>
-
+#include "strings.hxx"
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
@@ -172,7 +172,6 @@ sal_Bool VCLXAccessibleRadioButton::doAccessibleAction ( sal_Int32 nIndex )
     return true;
 }
 
-
 OUString VCLXAccessibleRadioButton::getAccessibleActionDescription ( sal_Int32 nIndex )
 {
     OExternalLockGuard aGuard( this );
@@ -180,10 +179,9 @@ OUString VCLXAccessibleRadioButton::getAccessibleActionDescription ( sal_Int32 n
     if ( nIndex < 0 || nIndex >= getAccessibleActionCount() )
         throw IndexOutOfBoundsException();
 
-    return TK_RES_STRING( RID_STR_ACC_ACTION_SELECT );
+    return OUString(RID_STR_ACC_ACTION_SELECT);
 }
 
-
 Reference< XAccessibleKeyBinding > VCLXAccessibleRadioButton::getAccessibleActionKeyBinding( sal_Int32 nIndex )
 {
     OExternalLockGuard aGuard( this );
diff --git a/accessibility/source/standard/vclxaccessiblescrollbar.cxx b/accessibility/source/standard/vclxaccessiblescrollbar.cxx
index cc8745c61c0e..9de2f42e1477 100644
--- a/accessibility/source/standard/vclxaccessiblescrollbar.cxx
+++ b/accessibility/source/standard/vclxaccessiblescrollbar.cxx
@@ -31,6 +31,7 @@
 #include <cppuhelper/typeprovider.hxx>
 #include <comphelper/sequence.hxx>
 #include <vcl/scrbar.hxx>
+#include "strings.hxx"
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
@@ -164,11 +165,11 @@ OUString VCLXAccessibleScrollBar::getAccessibleActionDescription ( sal_Int32 nIn
 
     switch ( nIndex )
     {
-        case 0:     sDescription = OUString( TK_RES_STRING( RID_STR_ACC_ACTION_DECLINE ) );      break;
-        case 1:     sDescription = OUString( TK_RES_STRING( RID_STR_ACC_ACTION_INCLINE ) );      break;
-        case 2:     sDescription = OUString( TK_RES_STRING( RID_STR_ACC_ACTION_DECBLOCK ) );     break;
-        case 3:     sDescription = OUString( TK_RES_STRING( RID_STR_ACC_ACTION_INCBLOCK ) );     break;
-        default:                                                                                        break;
+        case 0:     sDescription = OUString(RID_STR_ACC_ACTION_DECLINE);      break;
+        case 1:     sDescription = OUString(RID_STR_ACC_ACTION_INCLINE);      break;
+        case 2:     sDescription = OUString(RID_STR_ACC_ACTION_DECBLOCK);     break;
+        case 3:     sDescription = OUString(RID_STR_ACC_ACTION_INCBLOCK);     break;
+        default:                                                              break;
     }
 
     return sDescription;
diff --git a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
index 4d836e03e69e..a38b9fe59f09 100644
--- a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
+++ b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
@@ -43,6 +43,7 @@
 #include <unotools/accessiblerelationsethelper.hxx>
 #include <cppuhelper/typeprovider.hxx>
 #include <comphelper/sequence.hxx>
+#include "strings.hxx"
 
 #include <com/sun/star/accessibility/XAccessibleSelection.hpp>
 
@@ -644,7 +645,7 @@ OUString VCLXAccessibleToolBoxItem::getAccessibleActionDescription ( sal_Int32 n
     if ( nIndex < 0 || nIndex >= getAccessibleActionCount() )
         throw IndexOutOfBoundsException();
 
-    return OUString( TK_RES_STRING( RID_STR_ACC_ACTION_CLICK ) );
+    return OUString(RID_STR_ACC_ACTION_CLICK);
 }
 
 Reference< XAccessibleKeyBinding > VCLXAccessibleToolBoxItem::getAccessibleActionKeyBinding( sal_Int32 nIndex )