[Libreoffice-commits] core.git: accessibility/inc accessibility/source basctl/inc basctl/source desktop/inc desktop/source
Caolán McNamara
caolanm at redhat.com
Sun Apr 30 14:18:46 UTC 2017
accessibility/inc/helper/accessiblestrings.hrc | 9 -
accessibility/inc/strings.hxx | 23 ++
accessibility/source/helper/accessiblestrings.src | 35 ----
accessibility/source/standard/vclxaccessiblebox.cxx | 3
accessibility/source/standard/vclxaccessiblebutton.cxx | 3
accessibility/source/standard/vclxaccessiblemenuitem.cxx | 3
accessibility/source/standard/vclxaccessibleradiobutton.cxx | 6
accessibility/source/standard/vclxaccessiblescrollbar.cxx | 11 -
accessibility/source/standard/vclxaccessibletoolboxitem.cxx | 3
basctl/inc/strings.hxx | 41 +++++
basctl/source/dlged/dlgedobj.cxx | 55 +++---
basctl/source/dlged/dlgresid.src | 95 ------------
basctl/source/dlged/propbrw.cxx | 51 +++---
basctl/source/inc/dlgresid.hrc | 25 ---
desktop/inc/strings.hxx | 17 ++
desktop/source/app/app.cxx | 5
desktop/source/app/desktop.hrc | 1
desktop/source/app/desktop.src | 5
18 files changed, 153 insertions(+), 238 deletions(-)
New commits:
commit 59676b310bc0eba154f323f5d32ed697fcbb227a
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Apr 30 14:58:50 2017 +0100
untranslated strings are just strings
Change-Id: Ic7247a6d0e702572ca304bb048bfabfafcbf7505
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 )
diff --git a/basctl/inc/strings.hxx b/basctl/inc/strings.hxx
new file mode 100644
index 000000000000..ec06daaef937
--- /dev/null
+++ b/basctl/inc/strings.hxx
@@ -0,0 +1,41 @@
+/* -*- 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_BASCTL_INC_STRINGS_HRC
+#define INCLUDED_BASCTL_INC_STRINGS_HRC
+
+// Dialog Controls ---------------------------------------------------------------
+
+#define RID_STR_CLASS_CONTROL "Control"
+#define RID_STR_CLASS_DIALOG "Dialog"
+#define RID_STR_CLASS_BUTTON "CommandButton"
+#define RID_STR_CLASS_RADIOBUTTON "OptionButton"
+#define RID_STR_CLASS_CHECKBOX "CheckBox"
+#define RID_STR_CLASS_LISTBOX "ListBox"
+#define RID_STR_CLASS_COMBOBOX "ComboBox"
+#define RID_STR_CLASS_GROUPBOX "FrameControl"
+#define RID_STR_CLASS_EDIT "TextField"
+#define RID_STR_CLASS_FIXEDTEXT "Label"
+#define RID_STR_CLASS_IMAGECONTROL "ImageControl"
+#define RID_STR_CLASS_PROGRESSBAR "ProgressBar"
+#define RID_STR_CLASS_SCROLLBAR "ScrollBar"
+#define RID_STR_CLASS_FIXEDLINE "FixedLine"
+#define RID_STR_CLASS_DATEFIELD "DateField"
+#define RID_STR_CLASS_TIMEFIELD "TimeField"
+#define RID_STR_CLASS_NUMERICFIELD "NumericField"
+#define RID_STR_CLASS_CURRENCYFIELD "CurrencyField"
+#define RID_STR_CLASS_FORMATTEDFIELD "FormattedField"
+#define RID_STR_CLASS_PATTERNFIELD "PatternField"
+#define RID_STR_CLASS_FILECONTROL "FileControl"
+#define RID_STR_CLASS_TREECONTROL "TreeControl"
+#define RID_STR_CLASS_SPINCONTROL "SpinButton"
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/basctl/source/dlged/dlgedobj.cxx b/basctl/source/dlged/dlgedobj.cxx
index b02f73d7043b..c1ddd5672d51 100644
--- a/basctl/source/dlged/dlgedobj.cxx
+++ b/basctl/source/dlged/dlgedobj.cxx
@@ -31,6 +31,7 @@
#include "localizationmgr.hxx"
#include "dlgresid.hrc"
+#include "strings.hxx"
#include <com/sun/star/beans/NamedValue.hpp>
#include <com/sun/star/form/binding/XBindableValue.hpp>
@@ -636,105 +637,103 @@ bool DlgEdObj::supportsService( OUString const & serviceName ) const
OUString DlgEdObj::GetDefaultName() const
{
- sal_uInt16 nResId = 0;
+ OUString sResId;
OUString aDefaultName;
if ( supportsService( "com.sun.star.awt.UnoControlDialogModel" ) )
{
- nResId = RID_STR_CLASS_DIALOG;
+ sResId = RID_STR_CLASS_DIALOG;
}
else if ( supportsService( "com.sun.star.awt.UnoControlButtonModel" ) )
{
- nResId = RID_STR_CLASS_BUTTON;
+ sResId = RID_STR_CLASS_BUTTON;
}
else if ( supportsService( "com.sun.star.awt.UnoControlRadioButtonModel" ) )
{
- nResId = RID_STR_CLASS_RADIOBUTTON;
+ sResId = RID_STR_CLASS_RADIOBUTTON;
}
else if ( supportsService( "com.sun.star.awt.UnoControlCheckBoxModel" ) )
{
- nResId = RID_STR_CLASS_CHECKBOX;
+ sResId = RID_STR_CLASS_CHECKBOX;
}
else if ( supportsService( "com.sun.star.awt.UnoControlListBoxModel" ) )
{
- nResId = RID_STR_CLASS_LISTBOX;
+ sResId = RID_STR_CLASS_LISTBOX;
}
else if ( supportsService( "com.sun.star.awt.UnoControlComboBoxModel" ) )
{
- nResId = RID_STR_CLASS_COMBOBOX;
+ sResId = RID_STR_CLASS_COMBOBOX;
}
else if ( supportsService( "com.sun.star.awt.UnoControlGroupBoxModel" ) )
{
- nResId = RID_STR_CLASS_GROUPBOX;
+ sResId = RID_STR_CLASS_GROUPBOX;
}
else if ( supportsService( "com.sun.star.awt.UnoControlEditModel" ) )
{
- nResId = RID_STR_CLASS_EDIT;
+ sResId = RID_STR_CLASS_EDIT;
}
else if ( supportsService( "com.sun.star.awt.UnoControlFixedTextModel" ) )
{
- nResId = RID_STR_CLASS_FIXEDTEXT;
+ sResId = RID_STR_CLASS_FIXEDTEXT;
}
else if ( supportsService( "com.sun.star.awt.UnoControlImageControlModel" ) )
{
- nResId = RID_STR_CLASS_IMAGECONTROL;
+ sResId = RID_STR_CLASS_IMAGECONTROL;
}
else if ( supportsService( "com.sun.star.awt.UnoControlProgressBarModel" ) )
{
- nResId = RID_STR_CLASS_PROGRESSBAR;
+ sResId = RID_STR_CLASS_PROGRESSBAR;
}
else if ( supportsService( "com.sun.star.awt.UnoControlScrollBarModel" ) )
{
- nResId = RID_STR_CLASS_SCROLLBAR;
+ sResId = RID_STR_CLASS_SCROLLBAR;
}
else if ( supportsService( "com.sun.star.awt.UnoControlFixedLineModel" ) )
{
- nResId = RID_STR_CLASS_FIXEDLINE;
+ sResId = RID_STR_CLASS_FIXEDLINE;
}
else if ( supportsService( "com.sun.star.awt.UnoControlDateFieldModel" ) )
{
- nResId = RID_STR_CLASS_DATEFIELD;
+ sResId = RID_STR_CLASS_DATEFIELD;
}
else if ( supportsService( "com.sun.star.awt.UnoControlTimeFieldModel" ) )
{
- nResId = RID_STR_CLASS_TIMEFIELD;
+ sResId = RID_STR_CLASS_TIMEFIELD;
}
else if ( supportsService( "com.sun.star.awt.UnoControlNumericFieldModel" ) )
{
- nResId = RID_STR_CLASS_NUMERICFIELD;
+ sResId = RID_STR_CLASS_NUMERICFIELD;
}
else if ( supportsService( "com.sun.star.awt.UnoControlCurrencyFieldModel" ) )
{
- nResId = RID_STR_CLASS_CURRENCYFIELD;
+ sResId = RID_STR_CLASS_CURRENCYFIELD;
}
else if ( supportsService( "com.sun.star.awt.UnoControlFormattedFieldModel" ) )
{
- nResId = RID_STR_CLASS_FORMATTEDFIELD;
+ sResId = RID_STR_CLASS_FORMATTEDFIELD;
}
else if ( supportsService( "com.sun.star.awt.UnoControlPatternFieldModel" ) )
{
- nResId = RID_STR_CLASS_PATTERNFIELD;
+ sResId = RID_STR_CLASS_PATTERNFIELD;
}
else if ( supportsService( "com.sun.star.awt.UnoControlFileControlModel" ) )
{
- nResId = RID_STR_CLASS_FILECONTROL;
+ sResId = RID_STR_CLASS_FILECONTROL;
}
else if ( supportsService( "com.sun.star.awt.tree.TreeControlModel" ) )
{
- nResId = RID_STR_CLASS_TREECONTROL;
+ sResId = RID_STR_CLASS_TREECONTROL;
}
else if ( supportsService( "com.sun.star.awt.UnoControlSpinButtonModel" ) )
{
- nResId = RID_STR_CLASS_SPINCONTROL;
+ sResId = RID_STR_CLASS_SPINCONTROL;
}
else
{
- nResId = RID_STR_CLASS_CONTROL;
+ sResId = RID_STR_CLASS_CONTROL;
}
- if (nResId)
- {
- aDefaultName = IDE_RESSTR(nResId);
- }
+ if (!sResId.isEmpty())
+ aDefaultName = sResId;
return aDefaultName;
}
diff --git a/basctl/source/dlged/dlgresid.src b/basctl/source/dlged/dlgresid.src
index c4c6601ddc27..445250513f53 100644
--- a/basctl/source/dlged/dlgresid.src
+++ b/basctl/source/dlged/dlgresid.src
@@ -19,101 +19,6 @@
#include "dlgresid.hrc"
-// Dialog Controls ---------------------------------------------------------------
-
-String RID_STR_CLASS_CONTROL
-{
- Text = "Control" ;
-};
-String RID_STR_CLASS_DIALOG
-{
- Text = "Dialog" ;
-};
-String RID_STR_CLASS_BUTTON
-{
- Text = "CommandButton" ;
-};
-String RID_STR_CLASS_RADIOBUTTON
-{
- Text = "OptionButton" ;
-};
-String RID_STR_CLASS_CHECKBOX
-{
- Text = "CheckBox" ;
-};
-String RID_STR_CLASS_LISTBOX
-{
- Text = "ListBox" ;
-};
-String RID_STR_CLASS_COMBOBOX
-{
- Text = "ComboBox" ;
-};
-String RID_STR_CLASS_GROUPBOX
-{
- Text = "FrameControl" ;
-};
-String RID_STR_CLASS_EDIT
-{
- Text = "TextField" ;
-};
-String RID_STR_CLASS_FIXEDTEXT
-{
- Text = "Label" ;
-};
-String RID_STR_CLASS_IMAGECONTROL
-{
- Text = "ImageControl" ;
-};
-String RID_STR_CLASS_PROGRESSBAR
-{
- Text = "ProgressBar" ;
-};
-String RID_STR_CLASS_SCROLLBAR
-{
- Text = "ScrollBar" ;
-};
-String RID_STR_CLASS_FIXEDLINE
-{
- Text = "FixedLine" ;
-};
-String RID_STR_CLASS_DATEFIELD
-{
- Text = "DateField" ;
-};
-String RID_STR_CLASS_TIMEFIELD
-{
- Text = "TimeField" ;
-};
-String RID_STR_CLASS_NUMERICFIELD
-{
- Text = "NumericField" ;
-};
-String RID_STR_CLASS_CURRENCYFIELD
-{
- Text = "CurrencyField" ;
-};
-String RID_STR_CLASS_FORMATTEDFIELD
-{
- Text = "FormattedField" ;
-};
-String RID_STR_CLASS_PATTERNFIELD
-{
- Text = "PatternField" ;
-};
-String RID_STR_CLASS_FILECONTROL
-{
- Text = "FileControl" ;
-};
-String RID_STR_CLASS_TREECONTROL
-{
- Text = "TreeControl" ;
-};
-String RID_STR_CLASS_SPINCONTROL
-{
- Text = "SpinButton" ;
-};
-
// Property Browser Headline ----------------------------------------------------------------
String RID_STR_BRWTITLE_PROPERTIES
diff --git a/basctl/source/dlged/propbrw.cxx b/basctl/source/dlged/propbrw.cxx
index c4b5d3d34756..ab46f11eda50 100644
--- a/basctl/source/dlged/propbrw.cxx
+++ b/basctl/source/dlged/propbrw.cxx
@@ -25,6 +25,7 @@
#include "baside3.hxx"
#include "dlgresid.hrc"
+#include "strings.hxx"
#include <svx/svxids.hrc>
#include <com/sun/star/awt/PosSize.hpp>
@@ -312,101 +313,101 @@ OUString PropBrw::GetHeadlineName( const Reference< XPropertySet >& _rxObject )
if (xServiceInfo.is()) // single selection
{
- sal_uInt16 nResId = 0;
+ OUString sResId;
aName = IDE_RESSTR(RID_STR_BRWTITLE_PROPERTIES);
if ( xServiceInfo->supportsService( "com.sun.star.awt.UnoControlDialogModel" ) )
{
- nResId = RID_STR_CLASS_DIALOG;
+ sResId = RID_STR_CLASS_DIALOG;
}
else if ( xServiceInfo->supportsService( "com.sun.star.awt.UnoControlButtonModel" ) )
{
- nResId = RID_STR_CLASS_BUTTON;
+ sResId = RID_STR_CLASS_BUTTON;
}
else if ( xServiceInfo->supportsService( "com.sun.star.awt.UnoControlRadioButtonModel" ) )
{
- nResId = RID_STR_CLASS_RADIOBUTTON;
+ sResId = RID_STR_CLASS_RADIOBUTTON;
}
else if ( xServiceInfo->supportsService( "com.sun.star.awt.UnoControlCheckBoxModel" ) )
{
- nResId = RID_STR_CLASS_CHECKBOX;
+ sResId = RID_STR_CLASS_CHECKBOX;
}
else if ( xServiceInfo->supportsService( "com.sun.star.awt.UnoControlListBoxModel" ) )
{
- nResId = RID_STR_CLASS_LISTBOX;
+ sResId = RID_STR_CLASS_LISTBOX;
}
else if ( xServiceInfo->supportsService( "com.sun.star.awt.UnoControlComboBoxModel" ) )
{
- nResId = RID_STR_CLASS_COMBOBOX;
+ sResId = RID_STR_CLASS_COMBOBOX;
}
else if ( xServiceInfo->supportsService( "com.sun.star.awt.UnoControlGroupBoxModel" ) )
{
- nResId = RID_STR_CLASS_GROUPBOX;
+ sResId = RID_STR_CLASS_GROUPBOX;
}
else if ( xServiceInfo->supportsService( "com.sun.star.awt.UnoControlEditModel" ) )
{
- nResId = RID_STR_CLASS_EDIT;
+ sResId = RID_STR_CLASS_EDIT;
}
else if ( xServiceInfo->supportsService( "com.sun.star.awt.UnoControlFixedTextModel" ) )
{
- nResId = RID_STR_CLASS_FIXEDTEXT;
+ sResId = RID_STR_CLASS_FIXEDTEXT;
}
else if ( xServiceInfo->supportsService( "com.sun.star.awt.UnoControlImageControlModel" ) )
{
- nResId = RID_STR_CLASS_IMAGECONTROL;
+ sResId = RID_STR_CLASS_IMAGECONTROL;
}
else if ( xServiceInfo->supportsService( "com.sun.star.awt.UnoControlProgressBarModel" ) )
{
- nResId = RID_STR_CLASS_PROGRESSBAR;
+ sResId = RID_STR_CLASS_PROGRESSBAR;
}
else if ( xServiceInfo->supportsService( "com.sun.star.awt.UnoControlScrollBarModel" ) )
{
- nResId = RID_STR_CLASS_SCROLLBAR;
+ sResId = RID_STR_CLASS_SCROLLBAR;
}
else if ( xServiceInfo->supportsService( "com.sun.star.awt.UnoControlFixedLineModel" ) )
{
- nResId = RID_STR_CLASS_FIXEDLINE;
+ sResId = RID_STR_CLASS_FIXEDLINE;
}
else if ( xServiceInfo->supportsService( "com.sun.star.awt.UnoControlDateFieldModel" ) )
{
- nResId = RID_STR_CLASS_DATEFIELD;
+ sResId = RID_STR_CLASS_DATEFIELD;
}
else if ( xServiceInfo->supportsService( "com.sun.star.awt.UnoControlTimeFieldModel" ) )
{
- nResId = RID_STR_CLASS_TIMEFIELD;
+ sResId = RID_STR_CLASS_TIMEFIELD;
}
else if ( xServiceInfo->supportsService( "com.sun.star.awt.UnoControlNumericFieldModel" ) )
{
- nResId = RID_STR_CLASS_NUMERICFIELD;
+ sResId = RID_STR_CLASS_NUMERICFIELD;
}
else if ( xServiceInfo->supportsService( "com.sun.star.awt.UnoControlCurrencyFieldModel" ) )
{
- nResId = RID_STR_CLASS_CURRENCYFIELD;
+ sResId = RID_STR_CLASS_CURRENCYFIELD;
}
else if ( xServiceInfo->supportsService( "com.sun.star.awt.UnoControlFormattedFieldModel" ) )
{
- nResId = RID_STR_CLASS_FORMATTEDFIELD;
+ sResId = RID_STR_CLASS_FORMATTEDFIELD;
}
else if ( xServiceInfo->supportsService( "com.sun.star.awt.UnoControlPatternFieldModel" ) )
{
- nResId = RID_STR_CLASS_PATTERNFIELD;
+ sResId = RID_STR_CLASS_PATTERNFIELD;
}
else if ( xServiceInfo->supportsService( "com.sun.star.awt.UnoControlFileControlModel" ) )
{
- nResId = RID_STR_CLASS_FILECONTROL;
+ sResId = RID_STR_CLASS_FILECONTROL;
}
else if ( xServiceInfo->supportsService( "com.sun.star.awt.tree.TreeControlModel" ) )
{
- nResId = RID_STR_CLASS_TREECONTROL;
+ sResId = RID_STR_CLASS_TREECONTROL;
}
else
{
- nResId = RID_STR_CLASS_CONTROL;
+ sResId = RID_STR_CLASS_CONTROL;
}
- if (nResId)
+ if (!sResId.isEmpty())
{
- aName += IDE_RESSTR(nResId);
+ aName += sResId;
}
}
else if (!_rxObject.is()) // no properties
diff --git a/basctl/source/inc/dlgresid.hrc b/basctl/source/inc/dlgresid.hrc
index a6b1fc9829ef..3dc8a184920b 100644
--- a/basctl/source/inc/dlgresid.hrc
+++ b/basctl/source/inc/dlgresid.hrc
@@ -22,33 +22,8 @@
#include <svl/solar.hrc>
-// Dialog Control Id's -----------------------------------------------------------
-
-#define RID_STR_CLASS_CONTROL ( RID_DLG_START + 0 )
-#define RID_STR_CLASS_DIALOG ( RID_DLG_START + 1 )
-#define RID_STR_CLASS_BUTTON ( RID_DLG_START + 2 )
-#define RID_STR_CLASS_RADIOBUTTON ( RID_DLG_START + 3 )
-#define RID_STR_CLASS_CHECKBOX ( RID_DLG_START + 4 )
-#define RID_STR_CLASS_LISTBOX ( RID_DLG_START + 5 )
-#define RID_STR_CLASS_COMBOBOX ( RID_DLG_START + 6 )
-#define RID_STR_CLASS_GROUPBOX ( RID_DLG_START + 7 )
-#define RID_STR_CLASS_EDIT ( RID_DLG_START + 8 )
-#define RID_STR_CLASS_FIXEDTEXT ( RID_DLG_START + 9 )
-#define RID_STR_CLASS_IMAGECONTROL ( RID_DLG_START + 10 )
-#define RID_STR_CLASS_PROGRESSBAR ( RID_DLG_START + 11 )
-#define RID_STR_CLASS_SCROLLBAR ( RID_DLG_START + 12 )
-#define RID_STR_CLASS_FIXEDLINE ( RID_DLG_START + 13 )
-#define RID_STR_CLASS_DATEFIELD ( RID_DLG_START + 14 )
-#define RID_STR_CLASS_TIMEFIELD ( RID_DLG_START + 15 )
-#define RID_STR_CLASS_NUMERICFIELD ( RID_DLG_START + 16 )
-#define RID_STR_CLASS_CURRENCYFIELD ( RID_DLG_START + 17 )
-#define RID_STR_CLASS_FORMATTEDFIELD ( RID_DLG_START + 18 )
-#define RID_STR_CLASS_PATTERNFIELD ( RID_DLG_START + 19 )
-#define RID_STR_CLASS_FILECONTROL ( RID_DLG_START + 20 )
#define RID_STR_TRANSLATION_NOTLOCALIZED ( RID_DLG_START + 21 )
#define RID_STR_TRANSLATION_DEFAULT ( RID_DLG_START + 22 )
-#define RID_STR_CLASS_TREECONTROL ( RID_DLG_START + 23 )
-#define RID_STR_CLASS_SPINCONTROL ( RID_DLG_START + 24 )
#define RID_STR_DEF_LANG ( RID_DLG_START + 25 )
#define RID_STR_CREATE_LANG ( RID_DLG_START + 26 )
diff --git a/desktop/inc/strings.hxx b/desktop/inc/strings.hxx
new file mode 100644
index 000000000000..f89a3028cafe
--- /dev/null
+++ b/desktop/inc/strings.hxx
@@ -0,0 +1,17 @@
+/* -*- 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_DESKTOP_INC_STRINGS_HRC
+#define INCLUDED_DESKTOP_INC_STRINGS_HRC
+
+#define RID_APPTITLE "%PRODUCTNAME %PRODUCTVERSION%PRODUCTEXTENSION"
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 8a48f0082fde..1b0d26d219a4 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -145,6 +145,8 @@
#define GETPID getpid
#endif
+#include "strings.hxx"
+
using namespace ::com::sun::star::awt;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::util;
@@ -1467,8 +1469,7 @@ int Desktop::Main()
SetSplashScreenProgress(30);
// create title string
- ResMgr* pLabelResMgr = GetDesktopResManager();
- OUString aTitle = pLabelResMgr ? ResId(RID_APPTITLE, *pLabelResMgr).toString() : OUString();
+ OUString aTitle(ReplaceStringHookProc(OUString(RID_APPTITLE)));
#ifdef DBG_UTIL
//include buildid in non product builds
diff --git a/desktop/source/app/desktop.hrc b/desktop/source/app/desktop.hrc
index c4f477ec7b54..6863b1b6ed2c 100644
--- a/desktop/source/app/desktop.hrc
+++ b/desktop/source/app/desktop.hrc
@@ -54,7 +54,6 @@
#define STR_BOOSTRAP_ERR_NOACCESSRIGHTS (RID_DESKTOP_STRING_START+190)
#define STR_TITLE_USERDATALOCKED (RID_DESKTOP_STRING_START+206)
-#define RID_APPTITLE (RID_DESKTOP_STRING_START+208)
#endif
diff --git a/desktop/source/app/desktop.src b/desktop/source/app/desktop.src
index 76eb81585790..a4dd5da46f85 100644
--- a/desktop/source/app/desktop.src
+++ b/desktop/source/app/desktop.src
@@ -124,9 +124,4 @@ String STR_BOOSTRAP_ERR_NOACCESSRIGHTS
Text [ en-US ] = "%PRODUCTNAME user installation could not be processed due to missing access rights. Please make sure that you have sufficient access rights for the following location and restart %PRODUCTNAME:\n\n";
};
-String RID_APPTITLE
-{
- Text = "%PRODUCTNAME %PRODUCTVERSION%PRODUCTEXTENSION" ;
-};
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
More information about the Libreoffice-commits
mailing list