summaryrefslogtreecommitdiff
path: root/cui/source/tabpages
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2017-06-11 20:56:30 +0100
committerCaolán McNamara <caolanm@redhat.com>2017-07-21 08:20:50 +0100
commit00657aef09d854c74fb426a935a3e8b1fc390bb0 (patch)
treefd1a9bb264fe15dcc129498e62060ecd256b1ee7 /cui/source/tabpages
parentfa987cbb813cfd729fe490f2f1258b7c8d7fb174 (diff)
migrate to boost::gettext
* all .ui files go from <interface> to <interface domain="MODULE"> e.g. vcl * all .src files go away and the english source strings folded into the .hrc as NC_("context", "source string") * ResMgr is dropped in favour of std::locale imbued by boost::locale::generator pointed at matching MODULE .mo files * UIConfig translations are folded into the module .mo, so e.g. UIConfig_cui goes from l10n target to normal one, so the res/lang.zips of UI files go away * translation via Translation::get(hrc-define-key, imbued-std::locale) * python can now be translated with its inbuilt gettext support (we keep the name strings.hrc there to keep finding the .hrc file uniform) so magic numbers can go away there * java and starbasic components can be translated via the pre-existing css.resource.StringResourceWithLocation mechanism * en-US res files go away, their strings are now the .hrc keys in the source code * remaining .res files are replaced by .mo files * in .res/.ui-lang-zip files, the old scheme missing translations of strings results in inserting the english original so something can be found, now the standard fallback of using the english original from the source key is used, so partial translations shrink dramatically in size * extract .hrc strings with hrcex which backs onto xgettext -C --add-comments --keyword=NC_:1c,2 --from-code=UTF-8 --no-wrap * extract .ui strings with uiex which backs onto xgettext --add-comments --no-wrap * qtz for gettext translations is generated at runtime as ascii-ified crc32 of content + "|" + msgid * [API CHANGE] remove deprecated binary .res resouce loader related uno apis com::sun::star::resource::OfficeResourceLoader com::sun::star::resource::XResourceBundleLoader com::sun::star::resource::XResourceBundle when translating strings via uno apis com.sun.star.resource.StringResourceWithLocation can continue to be used Change-Id: Ia2594a2672b7301d9c3421fdf31b6cfe7f3f8d0a
Diffstat (limited to 'cui/source/tabpages')
-rw-r--r--cui/source/tabpages/align.cxx1
-rw-r--r--cui/source/tabpages/autocdlg.cxx1
-rw-r--r--cui/source/tabpages/backgrnd.cxx9
-rw-r--r--cui/source/tabpages/border.cxx8
-rw-r--r--cui/source/tabpages/border.src95
-rw-r--r--cui/source/tabpages/chardlg.cxx1
-rw-r--r--cui/source/tabpages/connect.cxx1
-rw-r--r--cui/source/tabpages/frmdirlbox.src61
-rw-r--r--cui/source/tabpages/grfpage.cxx1
-rw-r--r--cui/source/tabpages/measure.cxx10
-rw-r--r--cui/source/tabpages/numfmt.cxx1
-rw-r--r--cui/source/tabpages/numpages.cxx10
-rw-r--r--cui/source/tabpages/page.cxx2
-rw-r--r--cui/source/tabpages/paragrph.cxx1
-rw-r--r--cui/source/tabpages/strings.src195
-rw-r--r--cui/source/tabpages/swpossizetabpage.cxx12
-rw-r--r--cui/source/tabpages/tpbitmap.cxx4
-rw-r--r--cui/source/tabpages/tpcolor.cxx2
-rw-r--r--cui/source/tabpages/tpgradnt.cxx2
-rw-r--r--cui/source/tabpages/tphatch.cxx2
-rw-r--r--cui/source/tabpages/tpline.cxx2
-rw-r--r--cui/source/tabpages/tplnedef.cxx17
-rw-r--r--cui/source/tabpages/tplneend.cxx10
-rw-r--r--cui/source/tabpages/tppattern.cxx7
24 files changed, 61 insertions, 394 deletions
diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx
index 2586a454f71e..dfa4a531870d 100644
--- a/cui/source/tabpages/align.cxx
+++ b/cui/source/tabpages/align.cxx
@@ -22,6 +22,7 @@
#include <editeng/svxenum.hxx>
#include <svx/dialogs.hrc>
#include <cuires.hrc>
+#include <strings.hrc>
#include <bitmaps.hlst>
#include <svx/rotmodit.hxx>
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index 3b6a24608690..def8d3de5013 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -53,6 +53,7 @@
#include <editeng/svxacorr.hxx>
#include "cuicharmap.hxx"
#include "cuires.hrc"
+#include "strings.hrc"
#include <editeng/unolingu.hxx>
#include <dialmgr.hxx>
#include <svx/svxids.hrc>
diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index ec1775251187..343e4ff2722f 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -29,11 +29,12 @@
#include <sfx2/objsh.hxx>
#include <sfx2/docfile.hxx>
#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
#include <cuires.hrc>
+#include <strings.hrc>
#include <svx/dialmgr.hxx>
#include <editeng/memberids.hrc>
-#include <editeng/editrids.hrc>
#include <editeng/eerdll.hxx>
#include <editeng/brushitem.hxx>
@@ -45,7 +46,7 @@
#include <svx/drawitem.hxx>
#include <dialmgr.hxx>
#include <sfx2/htmlmode.hxx>
-#include <svtools/controldims.hrc>
+#include <svtools/controldims.hxx>
#include <svx/flagsdef.hxx>
#include <svl/intitem.hxx>
#include <sfx2/request.hxx>
@@ -822,8 +823,8 @@ void SvxBackgroundTabPage::RaiseLoadError_Impl()
SfxErrorContext aContext( ERRCTX_SVX_BACKGROUND,
OUString(),
this,
- RID_SVXERRCTX,
- &DIALOG_MGR() );
+ getRID_SVXERRCTX(),
+ &SvxResLocale() );
ErrorHandler::HandleError(
*new StringErrorInfo( ERRCODE_SVX_GRAPHIC_NOTREADABLE,
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index e6848ad3bd1a..dbcb814ced3e 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -22,8 +22,10 @@
#include <sfx2/module.hxx>
#include <svx/dialogs.hrc>
#include <svx/dialmgr.hxx>
+#include <svx/strings.hrc>
#include <cuires.hrc>
+#include <strings.hrc>
#include <bitmaps.hlst>
#include "helpid.hrc"
@@ -970,10 +972,10 @@ sal_uInt16 SvxBorderTabPage::GetPresetImageId( sal_uInt16 nValueSetIdx ) const
return ppnImgIds[ nLine ][ nValueSetIdx - 1 ];
}
-sal_uInt16 SvxBorderTabPage::GetPresetStringId( sal_uInt16 nValueSetIdx ) const
+const char* SvxBorderTabPage::GetPresetStringId( sal_uInt16 nValueSetIdx ) const
{
// string resource IDs for each image (in order of the IID_PRE_* image IDs)
- static const sal_uInt16 pnStrIds[] =
+ static const char* pnStrIds[] =
{
RID_SVXSTR_TABLE_PRESET_NONE,
RID_SVXSTR_PARA_PRESET_ALL,
@@ -1029,7 +1031,7 @@ void SvxBorderTabPage::FillShadowVS()
m_pWndShadows->SetColCount( SVX_BORDER_SHADOW_COUNT );
// string resource IDs for each image
- static const sal_uInt16 pnStrIds[ SVX_BORDER_SHADOW_COUNT ] =
+ static const char* pnStrIds[ SVX_BORDER_SHADOW_COUNT ] =
{ RID_SVXSTR_SHADOW_STYLE_NONE, RID_SVXSTR_SHADOW_STYLE_BOTTOMRIGHT, RID_SVXSTR_SHADOW_STYLE_TOPRIGHT, RID_SVXSTR_SHADOW_STYLE_BOTTOMLEFT, RID_SVXSTR_SHADOW_STYLE_TOPLEFT };
// insert images and help texts
diff --git a/cui/source/tabpages/border.src b/cui/source/tabpages/border.src
deleted file mode 100644
index 2dded5a4ded3..000000000000
--- a/cui/source/tabpages/border.src
+++ /dev/null
@@ -1,95 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include "helpid.hrc"
-#include <cuires.hrc>
-#include <svx/dialogs.hrc>
-
-String RID_SVXSTR_TABLE_PRESET_NONE
-{
- Text [ en-US ] = "Set No Borders" ;
-};
-String RID_SVXSTR_TABLE_PRESET_ONLYOUTER
-{
- Text [ en-US ] = "Set Outer Border Only" ;
-};
-String RID_SVXSTR_TABLE_PRESET_OUTERHORI
-{
- Text [ en-US ] = "Set Outer Border and Horizontal Lines" ;
-};
-String RID_SVXSTR_TABLE_PRESET_OUTERALL
-{
- Text [ en-US ] = "Set Outer Border and All Inner Lines" ;
-};
-String RID_SVXSTR_TABLE_PRESET_OUTERINNER
-{
- Text [ en-US ] = "Set Outer Border Without Changing Inner Lines" ;
-};
-String RID_SVXSTR_PARA_PRESET_DIAGONAL
-{
- Text [ en-US ] = "Set Diagonal Lines Only" ;
-};
-String RID_SVXSTR_PARA_PRESET_ALL
-{
- Text [ en-US ] = "Set All Four Borders" ;
-};
-String RID_SVXSTR_PARA_PRESET_LEFTRIGHT
-{
- Text [ en-US ] = "Set Left and Right Borders Only" ;
-};
-String RID_SVXSTR_PARA_PRESET_TOPBOTTOM
-{
- Text [ en-US ] = "Set Top and Bottom Borders Only" ;
-};
-String RID_SVXSTR_PARA_PRESET_ONLYLEFT
-{
- Text [ en-US ] = "Set Left Border Only" ;
-};
-String RID_SVXSTR_HOR_PRESET_ONLYHOR
-{
- Text [ en-US ] = "Set Top and Bottom Borders, and All Inner Lines";
-};
-String RID_SVXSTR_VER_PRESET_ONLYVER
-{
- Text [ en-US ] = "Set Left and Right Borders, and All Inner Lines";
-};
-String RID_SVXSTR_SHADOW_STYLE_NONE
-{
- Text [ en-US ] = "No Shadow" ;
-};
-String RID_SVXSTR_SHADOW_STYLE_BOTTOMRIGHT
-{
- Text [ en-US ] = "Cast Shadow to Bottom Right" ;
-};
-String RID_SVXSTR_SHADOW_STYLE_TOPRIGHT
-{
- Text [ en-US ] = "Cast Shadow to Top Right" ;
-};
-String RID_SVXSTR_SHADOW_STYLE_BOTTOMLEFT
-{
- Text [ en-US ] = "Cast Shadow to Bottom Left" ;
-};
-String RID_SVXSTR_SHADOW_STYLE_TOPLEFT
-{
- Text [ en-US ] = "Cast Shadow to Top Left" ;
-};
-
-// **********************************************************************
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index 063a9baac2c5..ef454619a8ad 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -69,6 +69,7 @@
#include <officecfg/Office/Common.hxx>
#include <svx/svxdlg.hxx>
#include <cuires.hrc>
+#include <strings.hrc>
#include <svl/intitem.hxx>
#include <sfx2/request.hxx>
#include "svx/flagsdef.hxx"
diff --git a/cui/source/tabpages/connect.cxx b/cui/source/tabpages/connect.cxx
index f4d566875385..d5df97d4c037 100644
--- a/cui/source/tabpages/connect.cxx
+++ b/cui/source/tabpages/connect.cxx
@@ -18,6 +18,7 @@
*/
#include <cuires.hrc>
+#include <strings.hrc>
#include <dialmgr.hxx>
#include <sfx2/app.hxx>
#include <sfx2/module.hxx>
diff --git a/cui/source/tabpages/frmdirlbox.src b/cui/source/tabpages/frmdirlbox.src
deleted file mode 100644
index e2470a6a93b0..000000000000
--- a/cui/source/tabpages/frmdirlbox.src
+++ /dev/null
@@ -1,61 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include <cuires.hrc>
-
-// frame direction ------------------------------------------------------------
-
-String RID_SVXSTR_FRAMEDIR_LTR
-{
- Text [ en-US ] = "Left-to-right (LTR)";
-};
-
-String RID_SVXSTR_FRAMEDIR_RTL
-{
- Text [ en-US ] = "Right-to-left (RTL)";
-};
-
-String RID_SVXSTR_FRAMEDIR_SUPER
-{
- Text [ en-US ] = "Use superordinate object settings";
-};
-
-// page direction -------------------------------------------------------------
-
-String RID_SVXSTR_PAGEDIR_LTR_HORI
-{
- Text [ en-US ] = "Left-to-right (horizontal)";
-};
-
-String RID_SVXSTR_PAGEDIR_RTL_HORI
-{
- Text [ en-US ] = "Right-to-left (horizontal)";
-};
-
-String RID_SVXSTR_PAGEDIR_RTL_VERT
-{
- Text [ en-US ] = "Right-to-left (vertical)";
-};
-
-String RID_SVXSTR_PAGEDIR_LTR_VERT
-{
- Text [ en-US ] = "Left-to-right (vertical)";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx
index 1938f2705b91..85e2c98e8595 100644
--- a/cui/source/tabpages/grfpage.cxx
+++ b/cui/source/tabpages/grfpage.cxx
@@ -33,6 +33,7 @@
#include <cuires.hrc>
#include <tools/fract.hxx>
#include <svx/dialogs.hrc>
+#include <strings.hrc>
#include <vcl/builderfactory.hxx>
#include <vcl/settings.hxx>
diff --git a/cui/source/tabpages/measure.cxx b/cui/source/tabpages/measure.cxx
index c502e077f08d..c41bf6b52286 100644
--- a/cui/source/tabpages/measure.cxx
+++ b/cui/source/tabpages/measure.cxx
@@ -18,6 +18,7 @@
*/
#include <cuires.hrc>
+#include <strings.hrc>
#include <dialmgr.hxx>
#include <sfx2/app.hxx>
#include <sfx2/module.hxx>
@@ -804,17 +805,16 @@ void SvxMeasurePage::ChangeAttrHdl_Impl( void* p )
void SvxMeasurePage::FillUnitLB()
{
// fill ListBox with metrics
- SvxStringArray aMetricArr(ResId(RID_SVXSTR_FIELDUNIT_TABLE, DIALOG_MGR()));
- sal_IntPtr nUnit = FUNIT_NONE;
+ FieldUnit nUnit = FUNIT_NONE;
OUString aStrMetric( m_pFtAutomatic->GetText());
sal_Int32 nPos = m_pLbUnit->InsertEntry( aStrMetric );
m_pLbUnit->SetEntryData( nPos, reinterpret_cast<void*>(nUnit) );
- for( sal_uInt32 i = 0; i < aMetricArr.Count(); ++i )
+ for( sal_uInt32 i = 0; i < SvxFieldUnitTable::Count(); ++i )
{
- aStrMetric = aMetricArr.GetStringByPos( i );
- nUnit = aMetricArr.GetValue( i );
+ aStrMetric = SvxFieldUnitTable::GetString(i);
+ nUnit = SvxFieldUnitTable::GetValue(i);
nPos = m_pLbUnit->InsertEntry( aStrMetric );
m_pLbUnit->SetEntryData( nPos, reinterpret_cast<void*>(nUnit) );
}
diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx
index 78cae7475cf6..a4981f5d84cf 100644
--- a/cui/source/tabpages/numfmt.cxx
+++ b/cui/source/tabpages/numfmt.cxx
@@ -31,6 +31,7 @@
#include <svtools/colorcfg.hxx>
#include <cuires.hrc>
+#include <strings.hrc>
#include <svx/numinf.hxx>
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index d0bf7386f770..30525c1045c6 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -32,6 +32,7 @@
#include <vcl/layout.hxx>
#include <vcl/svapp.hxx>
#include <svx/colorbox.hxx>
+#include <svx/strarray.hxx>
#include <svx/gallery.hxx>
#include <svl/urihelper.hxx>
#include <editeng/brushitem.hxx>
@@ -62,7 +63,6 @@
#include <com/sun/star/text/XNumberingTypeInfo.hpp>
#include <svx/dialmgr.hxx>
#include <svx/dialogs.hrc>
-#include <tools/resary.hxx>
#include <algorithm>
#include <memory>
@@ -70,6 +70,7 @@
#include "sfx2/opengrf.hxx"
#include <cuires.hrc>
+#include <strings.hrc>
#include <sfx2/request.hxx>
#include <svl/aeitem.hxx>
#include <svl/stritem.hxx>
@@ -1179,12 +1180,11 @@ SvxNumOptionsTabPage::SvxNumOptionsTabPage(vcl::Window* pParent,
eCoreUnit = rSet.GetPool()->GetMetric(rSet.GetPool()->GetWhich(SID_ATTR_NUMBERING_RULE));
// Fill ListBox with predefined / translated numbering types.
- ResStringArray aNames(ResId(RID_SVXSTRARY_NUMBERINGTYPE, DIALOG_MGR()));
- sal_uInt32 nCount = aNames.Count();
+ sal_uInt32 nCount = SvxNumberingTypeTable::Count();
for (sal_uInt32 i = 0; i < nCount; ++i)
{
- sal_Int32 nPos = m_pFmtLB->InsertEntry( aNames.GetString(i));
- m_pFmtLB->SetEntryData( nPos, reinterpret_cast<void*>(static_cast<sal_uIntPtr>(aNames.GetValue(i))));
+ sal_Int32 nPos = m_pFmtLB->InsertEntry(SvxNumberingTypeTable::GetString(i));
+ m_pFmtLB->SetEntryData( nPos, reinterpret_cast<void*>(static_cast<sal_uIntPtr>(SvxNumberingTypeTable::GetValue(i))));
}
// Get advanced numbering types from the component.
diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index 50e83e91714b..98f0d12ee183 100644
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -21,7 +21,6 @@
#include <sfx2/app.hxx>
#include <sfx2/objsh.hxx>
#include <sfx2/printer.hxx>
-#include <tools/resary.hxx>
#include <vcl/graph.hxx>
#include <sfx2/viewsh.hxx>
#include <svl/itemiter.hxx>
@@ -32,6 +31,7 @@
#include <sal/macros.h>
#include <cuires.hrc>
+#include <strings.hrc>
#include "helpid.hrc"
#include "page.hxx"
#include <svx/pageitem.hxx>
diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index 4d608a2e4147..a4f83510ae2c 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -30,6 +30,7 @@
#include <svl/cjkoptions.hxx>
#include <editeng/pgrditem.hxx>
#include <cuires.hrc>
+#include <strings.hrc>
#include "paragrph.hxx"
#include <editeng/frmdiritem.hxx>
#include <editeng/lspcitem.hxx>
diff --git a/cui/source/tabpages/strings.src b/cui/source/tabpages/strings.src
deleted file mode 100644
index 744aa6b60d58..000000000000
--- a/cui/source/tabpages/strings.src
+++ /dev/null
@@ -1,195 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include <cuires.hrc>
-
-String RID_SVXSTR_DESC_GRADIENT
-{
- Text [ en-US ] = "Please enter a name for the gradient:" ;
-};
-String RID_SVXSTR_DESC_NEW_BITMAP
-{
- Text [ en-US ] = "Please enter a name for the bitmap:" ;
-};
-String RID_SVXSTR_DESC_EXT_BITMAP
-{
- Text [ en-US ] = "Please enter a name for the external bitmap:" ;
-};
-String RID_SVXSTR_DESC_NEW_PATTERN
-{
- Text [ en-US ] = "Please enter a name for the pattern:" ;
-};
-String RID_SVXSTR_DESC_LINESTYLE
-{
- Text [ en-US ] = "Please enter a name for the line style:" ;
-};
-String RID_SVXSTR_ASK_CHANGE_LINESTYLE
-{
- Text [ en-US ] = "The line style was modified without saving. \nModify the selected line style or add a new line style." ;
-};
-String RID_SVXSTR_DESC_HATCH
-{
- Text [ en-US ] = "Please enter a name for the hatching:" ;
-};
-String RID_SVXSTR_CHANGE
-{
- Text [ en-US ] = "Modify" ;
-};
-String RID_SVXSTR_ADD
-{
- Text [ en-US ] = "Add" ;
-};
-String RID_SVXSTR_DESC_COLOR
-{
- Text [ en-US ] = "Please enter a name for the new color:" ;
-};
-String RID_SVXSTR_TABLE
-{
- Text [ en-US ] = "Table" ;
-};
-String RID_SVXSTR_DESC_LINEEND
-{
- Text [ en-US ] = "Please enter a name for the new arrowhead:" ;
-};
-String RID_SVXSTR_CHARNAME_NOSTYLE
-{
- Text [ en-US ] = "No %1";
-};
-String RID_SVXSTR_CHARNAME_FAMILY
-{
- Text [ en-US ] = "Family";
-};
-String RID_SVXSTR_CHARNAME_FONT
-{
- Text [ en-US ] = "Font";
-};
-String RID_SVXSTR_CHARNAME_STYLE
-{
- Text [ en-US ] = "Style";
-};
-String RID_SVXSTR_CHARNAME_TYPEFACE
-{
- Text [ en-US ] = "Typeface";
-};
-String RID_SVXSTR_CHARNAME_HIGHLIGHTING
-{
- Text [ en-US ] = "Highlight Color";
-};
-String RID_SVXSTR_USE_REPLACE
-{
- Text [ en-US ] = "Use replacement table" ;
-};
-String RID_SVXSTR_CPTL_STT_WORD
-{
- Text [ en-US ] = "Correct TWo INitial CApitals" ;
-};
-String RID_SVXSTR_CPTL_STT_SENT
-{
- Text [ en-US ] = "Capitalize first letter of every sentence" ;
-};
-String RID_SVXSTR_BOLD_UNDER
-{
- Text [ en-US ] = "Automatic *bold*, /italic/, -strikeout- and _underline_" ;
-};
-String RID_SVXSTR_NO_DBL_SPACES
-{
- Text [ en-US ] = "Ignore double spaces" ;
-};
-String RID_SVXSTR_DETECT_URL
-{
- Text [ en-US ] = "URL Recognition" ;
-};
-String RID_SVXSTR_DASH
-{
- Text [ en-US ] = "Replace dashes" ;
-};
-String RID_SVXSTR_CORRECT_ACCIDENTAL_CAPS_LOCK
-{
- Text [ en-US ] = "Correct accidental use of cAPS LOCK key" ;
-};
-String RID_SVXSTR_NON_BREAK_SPACE
-{
- Text [ en-US ] = "Add non-breaking space before specific punctuation marks in French text" ;
-};
-String RID_SVXSTR_ORDINAL
-{
- Text [ en-US ] = "Format ordinal numbers suffixes (1st -> 1^st)" ;
-};
-String RID_SVXSTR_DEL_EMPTY_PARA
-{
- Text [ en-US ] = "Remove blank paragraphs" ;
-};
-String RID_SVXSTR_USER_STYLE
-{
- Text [ en-US ] = "Replace Custom Styles" ;
-};
-String RID_SVXSTR_BULLET
-{
- Text [ en-US ] = "Replace bullets with: " ;
-};
-String RID_SVXSTR_RIGHT_MARGIN
-{
- Text [ en-US ] = "Combine single line paragraphs if length greater than" ;
-};
-String RID_SVXSTR_NUM
-{
- Text [ en-US ] = "Bulleted and numbered lists. Bullet symbol: " ;
-};
-String RID_SVXSTR_BORDER
-{
- Text [ en-US ] = "Apply border" ;
-};
-String RID_SVXSTR_CREATE_TABLE
-{
- Text [ en-US ] = "Create table" ;
-};
-String RID_SVXSTR_REPLACE_TEMPLATES
-{
- Text [ en-US ] = "Apply Styles" ;
-};
-String RID_SVXSTR_DEL_SPACES_AT_STT_END
-{
- Text [ en-US ] = "Delete spaces and tabs at beginning and end of paragraph";
-};
-String RID_SVXSTR_DEL_SPACES_BETWEEN_LINES
-{
- Text [ en-US ] = "Delete spaces and tabs at end and start of line";
-};
-String RID_SVXSTR_CONNECTOR
-{
- Text [en-US ] = "Connector";
-};
-String RID_SVXSTR_DIMENSION_LINE
-{
- Text [en-US ] = "Dimension line";
-};
-String RID_SVXSTR_LOAD_ERROR
-{
- Text [ en-US ] = "The selected module could not be loaded.";
-};
-String RID_SVXSTR_STARTQUOTE
-{
- Text [ en-US ] = "Start Quote";
-};
-String RID_SVXSTR_ENDQUOTE
-{
- Text [ en-US ] = "End Quote";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx
index 3c92d5a7a8f5..9bcd7c1454e1 100644
--- a/cui/source/tabpages/swpossizetabpage.cxx
+++ b/cui/source/tabpages/swpossizetabpage.cxx
@@ -683,7 +683,7 @@ void SvxSwPosSizeTabPage::setOptimalFrmWidth()
for (std::vector<SvxSwFramePosString::StringId>::const_iterator aI = aFrames.begin(), aEnd = aFrames.end();
aI != aEnd; ++aI)
{
- m_pHoriLB->InsertEntry(m_aFramePosString.GetString(*aI));
+ m_pHoriLB->InsertEntry(SvxSwFramePosString::GetString(*aI));
}
Size aBiggest(m_pHoriLB->GetOptimalSize());
@@ -724,7 +724,7 @@ void SvxSwPosSizeTabPage::setOptimalRelWidth()
for (std::vector<SvxSwFramePosString::StringId>::const_iterator aI = aRels.begin(), aEnd = aRels.end();
aI != aEnd; ++aI)
{
- m_pHoriLB->InsertEntry(m_aFramePosString.GetString(*aI));
+ m_pHoriLB->InsertEntry(SvxSwFramePosString::GetString(*aI));
}
Size aBiggest(m_pHoriLB->GetOptimalSize());
@@ -1462,7 +1462,7 @@ sal_uInt16 SvxSwPosSizeTabPage::GetMapPos(FrmMap *pMap, ListBox &rAlignLB)
{
SvxSwFramePosString::StringId eResId = pMap[i].eStrId;
- OUString sEntry = m_aFramePosString.GetString(eResId);
+ OUString sEntry = SvxSwFramePosString::GetString(eResId);
if (sEntry == sSelEntry)
{
@@ -1688,7 +1688,7 @@ void SvxSwPosSizeTabPage::FillRelLB(FrmMap *pMap, sal_uInt16 nMapPos, sal_uInt16
SvxSwFramePosString::StringId sStrId1 = aAsCharRelationMap[nRelPos].eStrId;
sStrId1 = lcl_ChangeResIdToVerticalOrRTL(sStrId1, m_bIsVerticalFrame, m_bIsInRightToLeft);
- OUString sEntry = m_aFramePosString.GetString(sStrId1);
+ OUString sEntry = SvxSwFramePosString::GetString(sStrId1);
sal_Int32 nPos = rLB.InsertEntry(sEntry);
rLB.SetEntryData(nPos, &aAsCharRelationMap[nRelPos]);
if (pMap[_nMapPos].nAlign == nAlign)
@@ -1745,7 +1745,7 @@ void SvxSwPosSizeTabPage::FillRelLB(FrmMap *pMap, sal_uInt16 nMapPos, sal_uInt16
{
SvxSwFramePosString::StringId sStrId1 = m_pHoriMirrorCB->IsChecked() ? aRelationMap[nRelPos].eMirrorStrId : aRelationMap[nRelPos].eStrId;
sStrId1 = lcl_ChangeResIdToVerticalOrRTL(sStrId1, m_bIsVerticalFrame, m_bIsInRightToLeft);
- OUString sEntry = m_aFramePosString.GetString(sStrId1);
+ OUString sEntry = SvxSwFramePosString::GetString(sStrId1);
sal_Int32 nPos = rLB.InsertEntry(sEntry);
rLB.SetEntryData(nPos, &aRelationMap[nRelPos]);
if (sSelEntry.isEmpty() && aRelationMap[nRelPos].nRelation == nRel)
@@ -1826,7 +1826,7 @@ sal_uInt16 SvxSwPosSizeTabPage::FillPosLB(FrmMap *_pMap,
{
SvxSwFramePosString::StringId eStrId = m_pHoriMirrorCB->IsChecked() ? _pMap[i].eMirrorStrId : _pMap[i].eStrId;
eStrId = lcl_ChangeResIdToVerticalOrRTL(eStrId, m_bIsVerticalFrame, m_bIsInRightToLeft);
- OUString sEntry(m_aFramePosString.GetString(eStrId));
+ OUString sEntry(SvxSwFramePosString::GetString(eStrId));
if (_rLB.GetEntryPos(sEntry) == LISTBOX_ENTRY_NOTFOUND)
{
// don't insert duplicate entries at character wrapped borders
diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx
index 5ea3afe39b2f..bc87cf191c8c 100644
--- a/cui/source/tabpages/tpbitmap.cxx
+++ b/cui/source/tabpages/tpbitmap.cxx
@@ -26,6 +26,7 @@
#include "svx/xattr.hxx"
#include <svx/xpool.hxx>
#include <cuires.hrc>
+#include <strings.hrc>
#include <svx/xflbckit.hxx>
#include <svx/svdattr.hxx>
#include <svx/xtable.hxx>
@@ -758,7 +759,6 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ModifyTileOffsetHdl, Edit&, void)
IMPL_LINK_NOARG(SvxBitmapTabPage, ClickImportHdl, Button*, void)
{
- ResMgr& rMgr = CUI_MGR();
SvxOpenGraphicDialog aDlg( "Import" );
aDlg.EnableLink(false);
long nCount = m_pBitmapList->Count();
@@ -773,7 +773,7 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickImportHdl, Button*, void)
if( !nError )
{
- OUString aDesc( ResId(RID_SVXSTR_DESC_EXT_BITMAP, rMgr) );
+ OUString aDesc(CuiResId(RID_SVXSTR_DESC_EXT_BITMAP));
ScopedVclPtr<MessageDialog> pWarnBox;
// convert file URL to UI name
diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx
index d9b140729036..fb2a1300696b 100644
--- a/cui/source/tabpages/tpcolor.cxx
+++ b/cui/source/tabpages/tpcolor.cxx
@@ -33,6 +33,7 @@
#include "com/sun/star/ui/dialogs/TemplateDescription.hpp"
#include <cuires.hrc>
+#include <strings.hrc>
#include "helpid.hrc"
#include "svx/xattr.hxx"
#include <svx/xpool.hxx>
@@ -46,6 +47,7 @@
#include <cuitabline.hxx>
#include <svx/dialmgr.hxx>
#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
#include <osl/file.hxx>
#include <svx/Palette.hxx>
#include <cppu/unotype.hxx>
diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx
index f7f2de67e2ae..8de274563d88 100644
--- a/cui/source/tabpages/tpgradnt.cxx
+++ b/cui/source/tabpages/tpgradnt.cxx
@@ -28,6 +28,7 @@
#include "com/sun/star/ui/dialogs/TemplateDescription.hpp"
#include <cuires.hrc>
+#include <strings.hrc>
#include "helpid.hrc"
#include <svx/colorbox.hxx>
#include "svx/xattr.hxx"
@@ -41,6 +42,7 @@
#include <dialmgr.hxx>
#include <svx/dialmgr.hxx>
#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
#include <o3tl/make_unique.hxx>
diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx
index 45b14ec5d2ca..0e78ab78089e 100644
--- a/cui/source/tabpages/tphatch.cxx
+++ b/cui/source/tabpages/tphatch.cxx
@@ -29,6 +29,7 @@
#include "com/sun/star/ui/dialogs/TemplateDescription.hpp"
#include <cuires.hrc>
+#include <strings.hrc>
#include "helpid.hrc"
#include <svx/colorbox.hxx>
#include "svx/xattr.hxx"
@@ -43,6 +44,7 @@
#include "svx/dlgutil.hxx"
#include <svx/dialmgr.hxx>
#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
#include <o3tl/make_unique.hxx>
diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx
index 0e6c80f070ce..de1526d4b7dc 100644
--- a/cui/source/tabpages/tpline.cxx
+++ b/cui/source/tabpages/tpline.cxx
@@ -25,6 +25,7 @@
#include <sfx2/module.hxx>
#include <cuires.hrc>
+#include <strings.hrc>
#include <svx/colorbox.hxx>
#include "svx/xattr.hxx"
#include <svx/xpool.hxx>
@@ -51,6 +52,7 @@
#include "sfx2/opengrf.hxx"
#include <svx/dialmgr.hxx>
#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
#include <vcl/settings.hxx>
#include <cuitabarea.hxx>
diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx
index f622e18358e7..1cd1b4f61a01 100644
--- a/cui/source/tabpages/tplnedef.cxx
+++ b/cui/source/tabpages/tplnedef.cxx
@@ -27,6 +27,7 @@
#include "com/sun/star/ui/dialogs/TemplateDescription.hpp"
#include <cuires.hrc>
+#include <strings.hrc>
#include "helpid.hrc"
#include "svx/xattr.hxx"
@@ -42,6 +43,7 @@
#include "svx/dlgutil.hxx"
#include <svx/dialmgr.hxx>
#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
#include <o3tl/make_unique.hxx>
#include "cuitabarea.hxx"
@@ -240,15 +242,14 @@ void SvxLineDefTabPage::CheckChanges_Impl()
m_pLbType2->IsValueChangedFromSaved() ||
m_pMtrDistance->IsValueChangedFromSaved() )
{
- ResMgr& rMgr = CUI_MGR();
Image aWarningBoxImage = WarningBox::GetStandardImage();
ScopedVclPtrInstance<SvxMessDialog> aMessDlg( GetParentDialog(),
SvxResId( RID_SVXSTR_LINESTYLE ),
- OUString( ResId( RID_SVXSTR_ASK_CHANGE_LINESTYLE, rMgr ) ),
+ CuiResId(RID_SVXSTR_ASK_CHANGE_LINESTYLE),
&aWarningBoxImage );
DBG_ASSERT(aMessDlg, "Dialog creation failed!");
- aMessDlg->SetButtonText( SvxMessDialogButton::N1, OUString( ResId( RID_SVXSTR_CHANGE, rMgr ) ) );
- aMessDlg->SetButtonText( SvxMessDialogButton::N2, OUString( ResId( RID_SVXSTR_ADD, rMgr ) ) );
+ aMessDlg->SetButtonText( SvxMessDialogButton::N1, CuiResId(RID_SVXSTR_CHANGE) );
+ aMessDlg->SetButtonText( SvxMessDialogButton::N2, CuiResId(RID_SVXSTR_ADD) );
short nRet = aMessDlg->Execute();
@@ -532,9 +533,8 @@ void SvxLineDefTabPage::SelectTypeHdl_Impl(ListBox* p)
IMPL_LINK_NOARG(SvxLineDefTabPage, ClickAddHdl_Impl, Button*, void)
{
- ResMgr& rMgr = CUI_MGR();
- OUString aNewName( SvxResId( RID_SVXSTR_LINESTYLE ) );
- OUString aDesc( ResId( RID_SVXSTR_DESC_LINESTYLE, rMgr ) );
+ OUString aNewName(SvxResId(RID_SVXSTR_LINESTYLE));
+ OUString aDesc(CuiResId(RID_SVXSTR_DESC_LINESTYLE));
OUString aName;
long nCount = pDashList->Count();
@@ -618,8 +618,7 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickModifyHdl_Impl, Button*, void)
if( nPos != LISTBOX_ENTRY_NOTFOUND )
{
- ResMgr& rMgr = CUI_MGR();
- OUString aDesc( ResId( RID_SVXSTR_DESC_LINESTYLE, rMgr ) );
+ OUString aDesc(CuiResId(RID_SVXSTR_DESC_LINESTYLE));
OUString aName( pDashList->GetDash( nPos )->GetName() );
OUString aOldName = aName;
diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx
index df8309d1054c..a5a0579226b7 100644
--- a/cui/source/tabpages/tplneend.cxx
+++ b/cui/source/tabpages/tplneend.cxx
@@ -26,6 +26,7 @@
#include "com/sun/star/ui/dialogs/TemplateDescription.hpp"
#include <cuires.hrc>
+#include <strings.hrc>
#include "helpid.hrc"
#include <svx/dialmgr.hxx>
#include <svx/svdobj.hxx>
@@ -45,6 +46,7 @@
#include <basegfx/polygon/b2dpolypolygontools.hxx>
#include <basegfx/matrix/b2dhommatrixtools.hxx>
#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
#include <o3tl/make_unique.hxx>
@@ -310,8 +312,7 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickModifyHdl_Impl, Button*, void)
if( nPos != LISTBOX_ENTRY_NOTFOUND )
{
- ResMgr& rMgr = CUI_MGR();
- OUString aDesc( ResId( RID_SVXSTR_DESC_LINEEND, rMgr ) );
+ OUString aDesc(CuiResId(RID_SVXSTR_DESC_LINEEND));
OUString aName( m_pEdtName->GetText() );
long nCount = pLineEndList->Count();
bool bDifferent = true;
@@ -417,9 +418,8 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickAddHdl_Impl, Button*, void)
SdrObject::Free( pConvPolyObj );
- ResMgr& rMgr = CUI_MGR();
- OUString aNewName( SvxResId( RID_SVXSTR_LINEEND ) );
- OUString aDesc( ResId( RID_SVXSTR_DESC_LINEEND, rMgr ) );
+ OUString aNewName(SvxResId(RID_SVXSTR_LINEEND));
+ OUString aDesc(CuiResId(RID_SVXSTR_DESC_LINEEND));
OUString aName;
long nCount = pLineEndList->Count();
diff --git a/cui/source/tabpages/tppattern.cxx b/cui/source/tabpages/tppattern.cxx
index dba1fc108066..9f57f7e5a0d5 100644
--- a/cui/source/tabpages/tppattern.cxx
+++ b/cui/source/tabpages/tppattern.cxx
@@ -33,8 +33,10 @@
#include <vcl/bitmapaccess.hxx>
#include <vcl/settings.hxx>
#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
#include <cuires.hrc>
+#include <strings.hrc>
#include "helpid.hrc"
#include "svx/xattr.hxx"
#include <svx/xpool.hxx>
@@ -468,9 +470,8 @@ IMPL_LINK_NOARG(SvxPatternTabPage, ClickRenameHdl_Impl, SvxPresetListBox*, void)
if ( nPos != VALUESET_ITEM_NOTFOUND )
{
- ResMgr& rMgr = CUI_MGR();
- OUString aDesc( ResId( RID_SVXSTR_DESC_NEW_PATTERN, rMgr ) );
- OUString aName( m_pPatternList->GetBitmap( nPos )->GetName() );
+ OUString aDesc(CuiResId(RID_SVXSTR_DESC_NEW_PATTERN));
+ OUString aName(m_pPatternList->GetBitmap(nPos)->GetName());
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
assert(pFact && "Dialog creation failed!");