[Libreoffice-commits] core.git: svx/source
Noel Grandin
noel.grandin at collabora.co.uk
Wed Sep 13 10:15:45 UTC 2017
svx/source/accessibility/ChildrenManagerImpl.cxx | 10
svx/source/dialog/charmap.cxx | 540 ++++++++++-----------
svx/source/dialog/framelink.cxx | 18
svx/source/dialog/frmsel.cxx | 26 -
svx/source/dialog/orienthelper.cxx | 6
svx/source/engine3d/helperhittest3d.cxx | 2
svx/source/fmcomp/fmgridcl.cxx | 60 +-
svx/source/form/fmobjfac.cxx | 6
svx/source/form/fmshimp.cxx | 6
svx/source/form/formcontroller.cxx | 4
svx/source/gallery2/galbrws1.cxx | 10
svx/source/sdr/contact/viewcontactofsdrobj.cxx | 2
svx/source/sdr/primitive2d/sdrattributecreator.cxx | 16
svx/source/svdraw/sdrpaintwindow.cxx | 2
svx/source/svdraw/svddrgmt.cxx | 2
svx/source/svdraw/svdedxv.cxx | 5
svx/source/svdraw/svdotextdecomposition.cxx | 8
svx/source/svdraw/svdotextpathdecomposition.cxx | 2
svx/source/tbxctrls/Palette.cxx | 6
svx/source/tbxctrls/PaletteManager.cxx | 4
svx/source/tbxctrls/fontworkgallery.cxx | 2
svx/source/tbxctrls/tbcontrl.cxx | 24
svx/source/xml/xmlgrhlp.cxx | 2
23 files changed, 381 insertions(+), 382 deletions(-)
New commits:
commit 0e3911478349349fb59dcc52cb5f5419fbdc7c0e
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Wed Sep 13 11:04:58 2017 +0200
clang-tidy modernize-use-emplace in svx
Change-Id: I52f062bf0b4c1af44576546d0593699758d71084
Reviewed-on: https://gerrit.libreoffice.org/42232
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/svx/source/accessibility/ChildrenManagerImpl.cxx b/svx/source/accessibility/ChildrenManagerImpl.cxx
index c4b72ffd70ff..7cf63fdf7f49 100644
--- a/svx/source/accessibility/ChildrenManagerImpl.cxx
+++ b/svx/source/accessibility/ChildrenManagerImpl.cxx
@@ -298,7 +298,7 @@ void ChildrenManagerImpl::CreateListOfVisibleShapes (
// bounding box has non-zero extensions.
awt::Rectangle aPixelBBox (xComponent->getBounds());
if ((aPixelBBox.Width > 0) && (aPixelBBox.Height > 0))
- raDescriptorList.push_back (ChildDescriptor (*I));
+ raDescriptorList.emplace_back(*I);
}
}
}
@@ -327,7 +327,7 @@ void ChildrenManagerImpl::CreateListOfVisibleShapes (
// Insert shape if it is visible, i.e. its bounding box overlaps
// the visible area.
if ( aBoundingBox.IsOver (aVisibleArea) )
- raDescriptorList.push_back (ChildDescriptor (xShape));
+ raDescriptorList.emplace_back(xShape);
}
}
}
@@ -456,7 +456,7 @@ void ChildrenManagerImpl::AddShape (const Reference<drawing::XShape>& rxShape)
if (aBoundingBox.IsOver (aVisibleArea))
{
// Add shape to list of visible shapes.
- maVisibleChildren.push_back (ChildDescriptor (rxShape));
+ maVisibleChildren.emplace_back(rxShape);
// Create accessibility object.
ChildDescriptor& rDescriptor = maVisibleChildren.back();
@@ -883,7 +883,7 @@ void ChildrenManagerImpl::UpdateSelection()
{
if (bDrawShape)
{
- vecSelect.push_back(std::make_pair(pAccessibleShape,true));
+ vecSelect.emplace_back(pAccessibleShape,true);
++nAddSelect;
}
}
@@ -899,7 +899,7 @@ void ChildrenManagerImpl::UpdateSelection()
{
if(bDrawShape)
{
- vecSelect.push_back(std::make_pair(pAccessibleShape,false));
+ vecSelect.emplace_back(pAccessibleShape,false);
}
}
}
diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx
index 9a1b22ad34e9..d4643b5988b2 100644
--- a/svx/source/dialog/charmap.cxx
+++ b/svx/source/dialog/charmap.cxx
@@ -1010,826 +1010,826 @@ void SubsetMap::InitList()
case UBLOCK_LOW_SURROGATES:
break;
case UBLOCK_BASIC_LATIN:
- aAllSubsets.push_back( Subset( 0x0000, 0x007F, SvxResId(RID_SUBSETSTR_BASIC_LATIN) ) );
+ aAllSubsets.emplace_back( 0x0000, 0x007F, SvxResId(RID_SUBSETSTR_BASIC_LATIN) );
break;
case UBLOCK_LATIN_1_SUPPLEMENT:
- aAllSubsets.push_back( Subset( 0x0080, 0x00FF, SvxResId(RID_SUBSETSTR_LATIN_1) ) );
+ aAllSubsets.emplace_back( 0x0080, 0x00FF, SvxResId(RID_SUBSETSTR_LATIN_1) );
break;
case UBLOCK_LATIN_EXTENDED_A:
- aAllSubsets.push_back( Subset( 0x0100, 0x017F, SvxResId(RID_SUBSETSTR_LATIN_EXTENDED_A) ) );
+ aAllSubsets.emplace_back( 0x0100, 0x017F, SvxResId(RID_SUBSETSTR_LATIN_EXTENDED_A) );
break;
case UBLOCK_LATIN_EXTENDED_B:
- aAllSubsets.push_back( Subset( 0x0180, 0x024F, SvxResId(RID_SUBSETSTR_LATIN_EXTENDED_B) ) );
+ aAllSubsets.emplace_back( 0x0180, 0x024F, SvxResId(RID_SUBSETSTR_LATIN_EXTENDED_B) );
break;
case UBLOCK_IPA_EXTENSIONS:
- aAllSubsets.push_back( Subset( 0x0250, 0x02AF, SvxResId(RID_SUBSETSTR_IPA_EXTENSIONS) ) );
+ aAllSubsets.emplace_back( 0x0250, 0x02AF, SvxResId(RID_SUBSETSTR_IPA_EXTENSIONS) );
break;
case UBLOCK_SPACING_MODIFIER_LETTERS:
- aAllSubsets.push_back( Subset( 0x02B0, 0x02FF, SvxResId(RID_SUBSETSTR_SPACING_MODIFIERS) ) );
+ aAllSubsets.emplace_back( 0x02B0, 0x02FF, SvxResId(RID_SUBSETSTR_SPACING_MODIFIERS) );
break;
case UBLOCK_COMBINING_DIACRITICAL_MARKS:
- aAllSubsets.push_back( Subset( 0x0300, 0x036F, SvxResId(RID_SUBSETSTR_COMB_DIACRITICAL) ) );
+ aAllSubsets.emplace_back( 0x0300, 0x036F, SvxResId(RID_SUBSETSTR_COMB_DIACRITICAL) );
break;
case UBLOCK_GREEK:
- aAllSubsets.push_back( Subset( 0x0370, 0x03FF, SvxResId(RID_SUBSETSTR_BASIC_GREEK) ) );
+ aAllSubsets.emplace_back( 0x0370, 0x03FF, SvxResId(RID_SUBSETSTR_BASIC_GREEK) );
break;
case UBLOCK_CYRILLIC:
- aAllSubsets.push_back( Subset( 0x0400, 0x04FF, SvxResId(RID_SUBSETSTR_CYRILLIC) ) );
+ aAllSubsets.emplace_back( 0x0400, 0x04FF, SvxResId(RID_SUBSETSTR_CYRILLIC) );
break;
case UBLOCK_ARMENIAN:
- aAllSubsets.push_back( Subset( 0x0530, 0x058F, SvxResId(RID_SUBSETSTR_ARMENIAN) ) );
+ aAllSubsets.emplace_back( 0x0530, 0x058F, SvxResId(RID_SUBSETSTR_ARMENIAN) );
break;
case UBLOCK_HEBREW:
- aAllSubsets.push_back( Subset( 0x0590, 0x05FF, SvxResId(RID_SUBSETSTR_BASIC_HEBREW) ) );
+ aAllSubsets.emplace_back( 0x0590, 0x05FF, SvxResId(RID_SUBSETSTR_BASIC_HEBREW) );
break;
case UBLOCK_ARABIC:
- aAllSubsets.push_back( Subset( 0x0600, 0x065F, SvxResId(RID_SUBSETSTR_BASIC_ARABIC) ) );
+ aAllSubsets.emplace_back( 0x0600, 0x065F, SvxResId(RID_SUBSETSTR_BASIC_ARABIC) );
break;
case UBLOCK_SYRIAC:
- aAllSubsets.push_back( Subset( 0x0700, 0x074F, SvxResId(RID_SUBSETSTR_SYRIAC) ) );
+ aAllSubsets.emplace_back( 0x0700, 0x074F, SvxResId(RID_SUBSETSTR_SYRIAC) );
break;
case UBLOCK_THAANA:
- aAllSubsets.push_back( Subset( 0x0780, 0x07BF, SvxResId(RID_SUBSETSTR_THAANA) ) );
+ aAllSubsets.emplace_back( 0x0780, 0x07BF, SvxResId(RID_SUBSETSTR_THAANA) );
break;
case UBLOCK_DEVANAGARI:
- aAllSubsets.push_back( Subset( 0x0900, 0x097F, SvxResId(RID_SUBSETSTR_DEVANAGARI) ) );
+ aAllSubsets.emplace_back( 0x0900, 0x097F, SvxResId(RID_SUBSETSTR_DEVANAGARI) );
break;
case UBLOCK_BENGALI:
- aAllSubsets.push_back( Subset( 0x0980, 0x09FF, SvxResId(RID_SUBSETSTR_BENGALI) ) );
+ aAllSubsets.emplace_back( 0x0980, 0x09FF, SvxResId(RID_SUBSETSTR_BENGALI) );
break;
case UBLOCK_GURMUKHI:
- aAllSubsets.push_back( Subset( 0x0A00, 0x0A7F, SvxResId(RID_SUBSETSTR_GURMUKHI) ) );
+ aAllSubsets.emplace_back( 0x0A00, 0x0A7F, SvxResId(RID_SUBSETSTR_GURMUKHI) );
break;
case UBLOCK_GUJARATI:
- aAllSubsets.push_back( Subset( 0x0A80, 0x0AFF, SvxResId(RID_SUBSETSTR_GUJARATI) ) );
+ aAllSubsets.emplace_back( 0x0A80, 0x0AFF, SvxResId(RID_SUBSETSTR_GUJARATI) );
break;
case UBLOCK_ORIYA:
- aAllSubsets.push_back( Subset( 0x0B00, 0x0B7F, SvxResId(RID_SUBSETSTR_ODIA) ) );
+ aAllSubsets.emplace_back( 0x0B00, 0x0B7F, SvxResId(RID_SUBSETSTR_ODIA) );
break;
case UBLOCK_TAMIL:
- aAllSubsets.push_back( Subset( 0x0B80, 0x0BFF, SvxResId(RID_SUBSETSTR_TAMIL) ) );
+ aAllSubsets.emplace_back( 0x0B80, 0x0BFF, SvxResId(RID_SUBSETSTR_TAMIL) );
break;
case UBLOCK_TELUGU:
- aAllSubsets.push_back( Subset( 0x0C00, 0x0C7F, SvxResId(RID_SUBSETSTR_TELUGU) ) );
+ aAllSubsets.emplace_back( 0x0C00, 0x0C7F, SvxResId(RID_SUBSETSTR_TELUGU) );
break;
case UBLOCK_KANNADA:
- aAllSubsets.push_back( Subset( 0x0C80, 0x0CFF, SvxResId(RID_SUBSETSTR_KANNADA) ) );
+ aAllSubsets.emplace_back( 0x0C80, 0x0CFF, SvxResId(RID_SUBSETSTR_KANNADA) );
break;
case UBLOCK_MALAYALAM:
- aAllSubsets.push_back( Subset( 0x0D00, 0x0D7F, SvxResId(RID_SUBSETSTR_MALAYALAM) ) );
+ aAllSubsets.emplace_back( 0x0D00, 0x0D7F, SvxResId(RID_SUBSETSTR_MALAYALAM) );
break;
case UBLOCK_SINHALA:
- aAllSubsets.push_back( Subset( 0x0D80, 0x0DFF, SvxResId(RID_SUBSETSTR_SINHALA) ) );
+ aAllSubsets.emplace_back( 0x0D80, 0x0DFF, SvxResId(RID_SUBSETSTR_SINHALA) );
break;
case UBLOCK_THAI:
- aAllSubsets.push_back( Subset( 0x0E00, 0x0E7F, SvxResId(RID_SUBSETSTR_THAI) ) );
+ aAllSubsets.emplace_back( 0x0E00, 0x0E7F, SvxResId(RID_SUBSETSTR_THAI) );
break;
case UBLOCK_LAO:
- aAllSubsets.push_back( Subset( 0x0E80, 0x0EFF, SvxResId(RID_SUBSETSTR_LAO) ) );
+ aAllSubsets.emplace_back( 0x0E80, 0x0EFF, SvxResId(RID_SUBSETSTR_LAO) );
break;
case UBLOCK_TIBETAN:
- aAllSubsets.push_back( Subset( 0x0F00, 0x0FBF, SvxResId(RID_SUBSETSTR_TIBETAN) ) );
+ aAllSubsets.emplace_back( 0x0F00, 0x0FBF, SvxResId(RID_SUBSETSTR_TIBETAN) );
break;
case UBLOCK_MYANMAR:
- aAllSubsets.push_back( Subset( 0x1000, 0x109F, SvxResId(RID_SUBSETSTR_MYANMAR) ) );
+ aAllSubsets.emplace_back( 0x1000, 0x109F, SvxResId(RID_SUBSETSTR_MYANMAR) );
break;
case UBLOCK_GEORGIAN:
- aAllSubsets.push_back( Subset( 0x10A0, 0x10FF, SvxResId(RID_SUBSETSTR_BASIC_GEORGIAN) ) );
+ aAllSubsets.emplace_back( 0x10A0, 0x10FF, SvxResId(RID_SUBSETSTR_BASIC_GEORGIAN) );
break;
case UBLOCK_HANGUL_JAMO:
- aAllSubsets.push_back( Subset( 0x1100, 0x11FF, SvxResId(RID_SUBSETSTR_HANGUL_JAMO) ) );
+ aAllSubsets.emplace_back( 0x1100, 0x11FF, SvxResId(RID_SUBSETSTR_HANGUL_JAMO) );
break;
case UBLOCK_ETHIOPIC:
- aAllSubsets.push_back( Subset( 0x1200, 0x137F, SvxResId(RID_SUBSETSTR_ETHIOPIC) ) );
+ aAllSubsets.emplace_back( 0x1200, 0x137F, SvxResId(RID_SUBSETSTR_ETHIOPIC) );
break;
case UBLOCK_CHEROKEE:
- aAllSubsets.push_back( Subset( 0x13A0, 0x13FF, SvxResId(RID_SUBSETSTR_CHEROKEE) ) );
+ aAllSubsets.emplace_back( 0x13A0, 0x13FF, SvxResId(RID_SUBSETSTR_CHEROKEE) );
break;
case UBLOCK_UNIFIED_CANADIAN_ABORIGINAL_SYLLABICS:
- aAllSubsets.push_back( Subset( 0x1400, 0x167F, SvxResId(RID_SUBSETSTR_CANADIAN_ABORIGINAL) ) );
+ aAllSubsets.emplace_back( 0x1400, 0x167F, SvxResId(RID_SUBSETSTR_CANADIAN_ABORIGINAL) );
break;
case UBLOCK_OGHAM:
- aAllSubsets.push_back( Subset( 0x1680, 0x169F, SvxResId(RID_SUBSETSTR_OGHAM) ) );
+ aAllSubsets.emplace_back( 0x1680, 0x169F, SvxResId(RID_SUBSETSTR_OGHAM) );
break;
case UBLOCK_RUNIC:
- aAllSubsets.push_back( Subset( 0x16A0, 0x16F0, SvxResId(RID_SUBSETSTR_RUNIC) ) );
+ aAllSubsets.emplace_back( 0x16A0, 0x16F0, SvxResId(RID_SUBSETSTR_RUNIC) );
break;
case UBLOCK_KHMER:
- aAllSubsets.push_back( Subset( 0x1780, 0x17FF, SvxResId(RID_SUBSETSTR_KHMER) ) );
+ aAllSubsets.emplace_back( 0x1780, 0x17FF, SvxResId(RID_SUBSETSTR_KHMER) );
break;
case UBLOCK_MONGOLIAN:
- aAllSubsets.push_back( Subset( 0x1800, 0x18AF, SvxResId(RID_SUBSETSTR_MONGOLIAN) ) );
+ aAllSubsets.emplace_back( 0x1800, 0x18AF, SvxResId(RID_SUBSETSTR_MONGOLIAN) );
break;
case UBLOCK_LATIN_EXTENDED_ADDITIONAL:
- aAllSubsets.push_back( Subset( 0x1E00, 0x1EFF, SvxResId(RID_SUBSETSTR_LATIN_EXTENDED_ADDS) ) );
+ aAllSubsets.emplace_back( 0x1E00, 0x1EFF, SvxResId(RID_SUBSETSTR_LATIN_EXTENDED_ADDS) );
break;
case UBLOCK_GREEK_EXTENDED:
- aAllSubsets.push_back( Subset( 0x1F00, 0x1FFF, SvxResId(RID_SUBSETSTR_GREEK_EXTENDED) ) );
+ aAllSubsets.emplace_back( 0x1F00, 0x1FFF, SvxResId(RID_SUBSETSTR_GREEK_EXTENDED) );
break;
case UBLOCK_GENERAL_PUNCTUATION:
- aAllSubsets.push_back( Subset( 0x2000, 0x206F, SvxResId(RID_SUBSETSTR_GENERAL_PUNCTUATION) ) );
+ aAllSubsets.emplace_back( 0x2000, 0x206F, SvxResId(RID_SUBSETSTR_GENERAL_PUNCTUATION) );
break;
case UBLOCK_SUPERSCRIPTS_AND_SUBSCRIPTS:
- aAllSubsets.push_back( Subset( 0x2070, 0x209F, SvxResId(RID_SUBSETSTR_SUB_SUPER_SCRIPTS) ) );
+ aAllSubsets.emplace_back( 0x2070, 0x209F, SvxResId(RID_SUBSETSTR_SUB_SUPER_SCRIPTS) );
break;
case UBLOCK_CURRENCY_SYMBOLS:
- aAllSubsets.push_back( Subset( 0x20A0, 0x20CF, SvxResId(RID_SUBSETSTR_CURRENCY_SYMBOLS) ) );
+ aAllSubsets.emplace_back( 0x20A0, 0x20CF, SvxResId(RID_SUBSETSTR_CURRENCY_SYMBOLS) );
break;
case UBLOCK_COMBINING_MARKS_FOR_SYMBOLS:
- aAllSubsets.push_back( Subset( 0x20D0, 0x20FF, SvxResId(RID_SUBSETSTR_COMB_DIACRITIC_SYMS) ) );
+ aAllSubsets.emplace_back( 0x20D0, 0x20FF, SvxResId(RID_SUBSETSTR_COMB_DIACRITIC_SYMS) );
break;
case UBLOCK_LETTERLIKE_SYMBOLS:
- aAllSubsets.push_back( Subset( 0x2100, 0x214F, SvxResId(RID_SUBSETSTR_LETTERLIKE_SYMBOLS) ) );
+ aAllSubsets.emplace_back( 0x2100, 0x214F, SvxResId(RID_SUBSETSTR_LETTERLIKE_SYMBOLS) );
break;
case UBLOCK_NUMBER_FORMS:
- aAllSubsets.push_back( Subset( 0x2150, 0x218F, SvxResId(RID_SUBSETSTR_NUMBER_FORMS) ) );
+ aAllSubsets.emplace_back( 0x2150, 0x218F, SvxResId(RID_SUBSETSTR_NUMBER_FORMS) );
break;
case UBLOCK_ARROWS:
- aAllSubsets.push_back( Subset( 0x2190, 0x21FF, SvxResId(RID_SUBSETSTR_ARROWS) ) );
+ aAllSubsets.emplace_back( 0x2190, 0x21FF, SvxResId(RID_SUBSETSTR_ARROWS) );
break;
case UBLOCK_MATHEMATICAL_OPERATORS:
- aAllSubsets.push_back( Subset( 0x2200, 0x22FF, SvxResId(RID_SUBSETSTR_MATH_OPERATORS) ) );
+ aAllSubsets.emplace_back( 0x2200, 0x22FF, SvxResId(RID_SUBSETSTR_MATH_OPERATORS) );
break;
case UBLOCK_MISCELLANEOUS_TECHNICAL:
- aAllSubsets.push_back( Subset( 0x2300, 0x23FF, SvxResId(RID_SUBSETSTR_MISC_TECHNICAL) ) );
+ aAllSubsets.emplace_back( 0x2300, 0x23FF, SvxResId(RID_SUBSETSTR_MISC_TECHNICAL) );
break;
case UBLOCK_CONTROL_PICTURES:
- aAllSubsets.push_back( Subset( 0x2400, 0x243F, SvxResId(RID_SUBSETSTR_CONTROL_PICTURES) ) );
+ aAllSubsets.emplace_back( 0x2400, 0x243F, SvxResId(RID_SUBSETSTR_CONTROL_PICTURES) );
break;
case UBLOCK_OPTICAL_CHARACTER_RECOGNITION:
- aAllSubsets.push_back( Subset( 0x2440, 0x245F, SvxResId(RID_SUBSETSTR_OPTICAL_CHAR_REC) ) );
+ aAllSubsets.emplace_back( 0x2440, 0x245F, SvxResId(RID_SUBSETSTR_OPTICAL_CHAR_REC) );
break;
case UBLOCK_ENCLOSED_ALPHANUMERICS:
- aAllSubsets.push_back( Subset( 0x2460, 0x24FF, SvxResId(RID_SUBSETSTR_ENCLOSED_ALPHANUM) ) );
+ aAllSubsets.emplace_back( 0x2460, 0x24FF, SvxResId(RID_SUBSETSTR_ENCLOSED_ALPHANUM) );
break;
case UBLOCK_BOX_DRAWING:
- aAllSubsets.push_back( Subset( 0x2500, 0x257F, SvxResId(RID_SUBSETSTR_BOX_DRAWING) ) );
+ aAllSubsets.emplace_back( 0x2500, 0x257F, SvxResId(RID_SUBSETSTR_BOX_DRAWING) );
break;
case UBLOCK_BLOCK_ELEMENTS:
- aAllSubsets.push_back( Subset( 0x2580, 0x259F, SvxResId(RID_SUBSETSTR_BLOCK_ELEMENTS) ) );
+ aAllSubsets.emplace_back( 0x2580, 0x259F, SvxResId(RID_SUBSETSTR_BLOCK_ELEMENTS) );
break;
case UBLOCK_GEOMETRIC_SHAPES:
- aAllSubsets.push_back( Subset( 0x25A0, 0x25FF, SvxResId(RID_SUBSETSTR_GEOMETRIC_SHAPES) ) );
+ aAllSubsets.emplace_back( 0x25A0, 0x25FF, SvxResId(RID_SUBSETSTR_GEOMETRIC_SHAPES) );
break;
case UBLOCK_MISCELLANEOUS_SYMBOLS:
- aAllSubsets.push_back( Subset( 0x2600, 0x26FF, SvxResId(RID_SUBSETSTR_MISC_DINGBATS) ) );
+ aAllSubsets.emplace_back( 0x2600, 0x26FF, SvxResId(RID_SUBSETSTR_MISC_DINGBATS) );
break;
case UBLOCK_DINGBATS:
- aAllSubsets.push_back( Subset( 0x2700, 0x27BF, SvxResId(RID_SUBSETSTR_DINGBATS) ) );
+ aAllSubsets.emplace_back( 0x2700, 0x27BF, SvxResId(RID_SUBSETSTR_DINGBATS) );
break;
case UBLOCK_BRAILLE_PATTERNS:
- aAllSubsets.push_back( Subset( 0x2800, 0x28FF, SvxResId(RID_SUBSETSTR_BRAILLE_PATTERNS) ) );
+ aAllSubsets.emplace_back( 0x2800, 0x28FF, SvxResId(RID_SUBSETSTR_BRAILLE_PATTERNS) );
break;
case UBLOCK_CJK_RADICALS_SUPPLEMENT:
- aAllSubsets.push_back( Subset( 0x2E80, 0x2EFF, SvxResId(RID_SUBSETSTR_CJK_RADICAL_SUPPL) ) );
+ aAllSubsets.emplace_back( 0x2E80, 0x2EFF, SvxResId(RID_SUBSETSTR_CJK_RADICAL_SUPPL) );
break;
case UBLOCK_KANGXI_RADICALS:
- aAllSubsets.push_back( Subset( 0x2F00, 0x2FDF, SvxResId(RID_SUBSETSTR_KANGXI_RADICALS) ) );
+ aAllSubsets.emplace_back( 0x2F00, 0x2FDF, SvxResId(RID_SUBSETSTR_KANGXI_RADICALS) );
break;
case UBLOCK_IDEOGRAPHIC_DESCRIPTION_CHARACTERS:
- aAllSubsets.push_back( Subset( 0x2FF0, 0x2FFF, SvxResId(RID_SUBSETSTR_IDEO_DESC_CHARS) ) );
+ aAllSubsets.emplace_back( 0x2FF0, 0x2FFF, SvxResId(RID_SUBSETSTR_IDEO_DESC_CHARS) );
break;
case UBLOCK_CJK_SYMBOLS_AND_PUNCTUATION:
- aAllSubsets.push_back( Subset( 0x3000, 0x303F, SvxResId(RID_SUBSETSTR_CJK_SYMS_PUNCTUATION) ) );
+ aAllSubsets.emplace_back( 0x3000, 0x303F, SvxResId(RID_SUBSETSTR_CJK_SYMS_PUNCTUATION) );
break;
case UBLOCK_HIRAGANA:
- aAllSubsets.push_back( Subset( 0x3040, 0x309F, SvxResId(RID_SUBSETSTR_HIRAGANA) ) );
+ aAllSubsets.emplace_back( 0x3040, 0x309F, SvxResId(RID_SUBSETSTR_HIRAGANA) );
break;
case UBLOCK_KATAKANA:
- aAllSubsets.push_back( Subset( 0x30A0, 0x30FF, SvxResId(RID_SUBSETSTR_KATAKANA) ) );
+ aAllSubsets.emplace_back( 0x30A0, 0x30FF, SvxResId(RID_SUBSETSTR_KATAKANA) );
break;
case UBLOCK_BOPOMOFO:
- aAllSubsets.push_back( Subset( 0x3100, 0x312F, SvxResId(RID_SUBSETSTR_BOPOMOFO) ) );
+ aAllSubsets.emplace_back( 0x3100, 0x312F, SvxResId(RID_SUBSETSTR_BOPOMOFO) );
break;
case UBLOCK_HANGUL_COMPATIBILITY_JAMO:
- aAllSubsets.push_back( Subset( 0x3130, 0x318F, SvxResId(RID_SUBSETSTR_HANGUL_COMPAT_JAMO) ) );
+ aAllSubsets.emplace_back( 0x3130, 0x318F, SvxResId(RID_SUBSETSTR_HANGUL_COMPAT_JAMO) );
break;
case UBLOCK_KANBUN:
- aAllSubsets.push_back( Subset( 0x3190, 0x319F, SvxResId(RID_SUBSETSTR_KANBUN) ) );
+ aAllSubsets.emplace_back( 0x3190, 0x319F, SvxResId(RID_SUBSETSTR_KANBUN) );
break;
case UBLOCK_BOPOMOFO_EXTENDED:
- aAllSubsets.push_back( Subset( 0x31A0, 0x31BF, SvxResId(RID_SUBSETSTR_BOPOMOFO_EXTENDED) ) );
+ aAllSubsets.emplace_back( 0x31A0, 0x31BF, SvxResId(RID_SUBSETSTR_BOPOMOFO_EXTENDED) );
break;
case UBLOCK_ENCLOSED_CJK_LETTERS_AND_MONTHS:
- aAllSubsets.push_back( Subset( 0x3200, 0x32FF, SvxResId(RID_SUBSETSTR_ENCLOSED_CJK_LETTERS) ) );
+ aAllSubsets.emplace_back( 0x3200, 0x32FF, SvxResId(RID_SUBSETSTR_ENCLOSED_CJK_LETTERS) );
break;
case UBLOCK_CJK_COMPATIBILITY:
- aAllSubsets.push_back( Subset( 0x3300, 0x33FF, SvxResId(RID_SUBSETSTR_CJK_COMPATIBILITY) ) );
+ aAllSubsets.emplace_back( 0x3300, 0x33FF, SvxResId(RID_SUBSETSTR_CJK_COMPATIBILITY) );
break;
case UBLOCK_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_A:
- aAllSubsets.push_back( Subset( 0x3400, 0x4DBF, SvxResId(RID_SUBSETSTR_CJK_EXT_A_UNIFIED_IDGRAPH) ) );
+ aAllSubsets.emplace_back( 0x3400, 0x4DBF, SvxResId(RID_SUBSETSTR_CJK_EXT_A_UNIFIED_IDGRAPH) );
break;
case UBLOCK_CJK_UNIFIED_IDEOGRAPHS:
- aAllSubsets.push_back( Subset( 0x4E00, 0x9FA5, SvxResId(RID_SUBSETSTR_CJK_UNIFIED_IDGRAPH) ) );
+ aAllSubsets.emplace_back( 0x4E00, 0x9FA5, SvxResId(RID_SUBSETSTR_CJK_UNIFIED_IDGRAPH) );
break;
case UBLOCK_YI_SYLLABLES:
- aAllSubsets.push_back( Subset( 0xA000, 0xA48F, SvxResId(RID_SUBSETSTR_YI_SYLLABLES) ) );
+ aAllSubsets.emplace_back( 0xA000, 0xA48F, SvxResId(RID_SUBSETSTR_YI_SYLLABLES) );
break;
case UBLOCK_YI_RADICALS:
- aAllSubsets.push_back( Subset( 0xA490, 0xA4CF, SvxResId(RID_SUBSETSTR_YI_RADICALS) ) );
+ aAllSubsets.emplace_back( 0xA490, 0xA4CF, SvxResId(RID_SUBSETSTR_YI_RADICALS) );
break;
case UBLOCK_HANGUL_SYLLABLES:
- aAllSubsets.push_back( Subset( 0xAC00, 0xD7AF, SvxResId(RID_SUBSETSTR_HANGUL) ) );
+ aAllSubsets.emplace_back( 0xAC00, 0xD7AF, SvxResId(RID_SUBSETSTR_HANGUL) );
break;
case UBLOCK_PRIVATE_USE_AREA:
- aAllSubsets.push_back( Subset( 0xE000, 0xF8FF, SvxResId(RID_SUBSETSTR_PRIVATE_USE_AREA) ) );
+ aAllSubsets.emplace_back( 0xE000, 0xF8FF, SvxResId(RID_SUBSETSTR_PRIVATE_USE_AREA) );
break;
case UBLOCK_CJK_COMPATIBILITY_IDEOGRAPHS:
- aAllSubsets.push_back( Subset( 0xF900, 0xFAFF, SvxResId(RID_SUBSETSTR_CJK_COMPAT_IDGRAPHS) ) );
+ aAllSubsets.emplace_back( 0xF900, 0xFAFF, SvxResId(RID_SUBSETSTR_CJK_COMPAT_IDGRAPHS) );
break;
case UBLOCK_ALPHABETIC_PRESENTATION_FORMS:
- aAllSubsets.push_back( Subset( 0xFB00, 0xFB4F, SvxResId(RID_SUBSETSTR_ALPHA_PRESENTATION) ) );
+ aAllSubsets.emplace_back( 0xFB00, 0xFB4F, SvxResId(RID_SUBSETSTR_ALPHA_PRESENTATION) );
break;
case UBLOCK_ARABIC_PRESENTATION_FORMS_A:
- aAllSubsets.push_back( Subset( 0xFB50, 0xFDFF, SvxResId(RID_SUBSETSTR_ARABIC_PRESENT_A) ) );
+ aAllSubsets.emplace_back( 0xFB50, 0xFDFF, SvxResId(RID_SUBSETSTR_ARABIC_PRESENT_A) );
break;
case UBLOCK_COMBINING_HALF_MARKS:
- aAllSubsets.push_back( Subset( 0xFE20, 0xFE2F, SvxResId(RID_SUBSETSTR_COMBINING_HALF_MARKS) ) );
+ aAllSubsets.emplace_back( 0xFE20, 0xFE2F, SvxResId(RID_SUBSETSTR_COMBINING_HALF_MARKS) );
break;
case UBLOCK_CJK_COMPATIBILITY_FORMS:
- aAllSubsets.push_back( Subset( 0xFE30, 0xFE4F, SvxResId(RID_SUBSETSTR_CJK_COMPAT_FORMS) ) );
+ aAllSubsets.emplace_back( 0xFE30, 0xFE4F, SvxResId(RID_SUBSETSTR_CJK_COMPAT_FORMS) );
break;
case UBLOCK_SMALL_FORM_VARIANTS:
- aAllSubsets.push_back( Subset( 0xFE50, 0xFE6F, SvxResId(RID_SUBSETSTR_SMALL_FORM_VARIANTS) ) );
+ aAllSubsets.emplace_back( 0xFE50, 0xFE6F, SvxResId(RID_SUBSETSTR_SMALL_FORM_VARIANTS) );
break;
case UBLOCK_ARABIC_PRESENTATION_FORMS_B:
- aAllSubsets.push_back( Subset( 0xFE70, 0xFEFF, SvxResId(RID_SUBSETSTR_ARABIC_PRESENT_B) ) );
+ aAllSubsets.emplace_back( 0xFE70, 0xFEFF, SvxResId(RID_SUBSETSTR_ARABIC_PRESENT_B) );
break;
case UBLOCK_SPECIALS:
- aAllSubsets.push_back( Subset( 0xFFF0, 0xFFFF, SvxResId(RID_SUBSETSTR_SPECIALS) ) );
+ aAllSubsets.emplace_back( 0xFFF0, 0xFFFF, SvxResId(RID_SUBSETSTR_SPECIALS) );
break;
case UBLOCK_HALFWIDTH_AND_FULLWIDTH_FORMS:
- aAllSubsets.push_back( Subset( 0xFF00, 0xFFEF, SvxResId(RID_SUBSETSTR_HALFW_FULLW_FORMS) ) );
+ aAllSubsets.emplace_back( 0xFF00, 0xFFEF, SvxResId(RID_SUBSETSTR_HALFW_FULLW_FORMS) );
break;
case UBLOCK_OLD_ITALIC:
- aAllSubsets.push_back( Subset( 0x10300, 0x1032F, SvxResId(RID_SUBSETSTR_OLD_ITALIC) ) );
+ aAllSubsets.emplace_back( 0x10300, 0x1032F, SvxResId(RID_SUBSETSTR_OLD_ITALIC) );
break;
case UBLOCK_GOTHIC:
- aAllSubsets.push_back( Subset( 0x10330, 0x1034F, SvxResId(RID_SUBSETSTR_GOTHIC) ) );
+ aAllSubsets.emplace_back( 0x10330, 0x1034F, SvxResId(RID_SUBSETSTR_GOTHIC) );
break;
case UBLOCK_DESERET:
- aAllSubsets.push_back( Subset( 0x10400, 0x1044F, SvxResId(RID_SUBSETSTR_DESERET) ) );
+ aAllSubsets.emplace_back( 0x10400, 0x1044F, SvxResId(RID_SUBSETSTR_DESERET) );
break;
case UBLOCK_BYZANTINE_MUSICAL_SYMBOLS:
- aAllSubsets.push_back( Subset( 0x1D000, 0x1D0FF, SvxResId(RID_SUBSETSTR_BYZANTINE_MUSICAL_SYMBOLS) ) );
+ aAllSubsets.emplace_back( 0x1D000, 0x1D0FF, SvxResId(RID_SUBSETSTR_BYZANTINE_MUSICAL_SYMBOLS) );
break;
case UBLOCK_MUSICAL_SYMBOLS:
- aAllSubsets.push_back( Subset( 0x1D100, 0x1D1FF, SvxResId(RID_SUBSETSTR_MUSICAL_SYMBOLS) ) );
+ aAllSubsets.emplace_back( 0x1D100, 0x1D1FF, SvxResId(RID_SUBSETSTR_MUSICAL_SYMBOLS) );
break;
case UBLOCK_MATHEMATICAL_ALPHANUMERIC_SYMBOLS:
- aAllSubsets.push_back( Subset( 0x1D400, 0x1D7FF, SvxResId(RID_SUBSETSTR_MATHEMATICAL_ALPHANUMERIC_SYMBOLS) ) );
+ aAllSubsets.emplace_back( 0x1D400, 0x1D7FF, SvxResId(RID_SUBSETSTR_MATHEMATICAL_ALPHANUMERIC_SYMBOLS) );
break;
case UBLOCK_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_B:
- aAllSubsets.push_back( Subset( 0x20000, 0x2A6DF, SvxResId(RID_SUBSETSTR_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_B) ) );
+ aAllSubsets.emplace_back( 0x20000, 0x2A6DF, SvxResId(RID_SUBSETSTR_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_B) );
break;
case UBLOCK_CJK_COMPATIBILITY_IDEOGRAPHS_SUPPLEMENT:
- aAllSubsets.push_back( Subset( 0x2F800, 0x2FA1F, SvxResId(RID_SUBSETSTR_CJK_COMPATIBILITY_IDEOGRAPHS_SUPPLEMENT) ) );
+ aAllSubsets.emplace_back( 0x2F800, 0x2FA1F, SvxResId(RID_SUBSETSTR_CJK_COMPATIBILITY_IDEOGRAPHS_SUPPLEMENT) );
break;
case UBLOCK_TAGS:
- aAllSubsets.push_back( Subset( 0xE0000, 0xE007F, SvxResId(RID_SUBSETSTR_TAGS) ) );
+ aAllSubsets.emplace_back( 0xE0000, 0xE007F, SvxResId(RID_SUBSETSTR_TAGS) );
break;
case UBLOCK_CYRILLIC_SUPPLEMENTARY:
- aAllSubsets.push_back( Subset( 0x0500, 0x052F, SvxResId(RID_SUBSETSTR_CYRILLIC_SUPPLEMENTARY) ) );
+ aAllSubsets.emplace_back( 0x0500, 0x052F, SvxResId(RID_SUBSETSTR_CYRILLIC_SUPPLEMENTARY) );
break;
case UBLOCK_TAGALOG:
- aAllSubsets.push_back( Subset( 0x1700, 0x171F, SvxResId(RID_SUBSETSTR_TAGALOG) ) );
+ aAllSubsets.emplace_back( 0x1700, 0x171F, SvxResId(RID_SUBSETSTR_TAGALOG) );
break;
case UBLOCK_HANUNOO:
- aAllSubsets.push_back( Subset( 0x1720, 0x173F, SvxResId(RID_SUBSETSTR_HANUNOO) ) );
+ aAllSubsets.emplace_back( 0x1720, 0x173F, SvxResId(RID_SUBSETSTR_HANUNOO) );
break;
case UBLOCK_BUHID:
- aAllSubsets.push_back( Subset( 0x1740, 0x175F, SvxResId(RID_SUBSETSTR_BUHID) ) );
+ aAllSubsets.emplace_back( 0x1740, 0x175F, SvxResId(RID_SUBSETSTR_BUHID) );
break;
case UBLOCK_TAGBANWA:
- aAllSubsets.push_back( Subset( 0x1760, 0x177F, SvxResId(RID_SUBSETSTR_TAGBANWA) ) );
+ aAllSubsets.emplace_back( 0x1760, 0x177F, SvxResId(RID_SUBSETSTR_TAGBANWA) );
break;
case UBLOCK_MISCELLANEOUS_MATHEMATICAL_SYMBOLS_A:
- aAllSubsets.push_back( Subset( 0x27C0, 0x27EF, SvxResId(RID_SUBSETSTR_MISC_MATH_SYMS_A) ) );
+ aAllSubsets.emplace_back( 0x27C0, 0x27EF, SvxResId(RID_SUBSETSTR_MISC_MATH_SYMS_A) );
break;
case UBLOCK_SUPPLEMENTAL_ARROWS_A:
- aAllSubsets.push_back( Subset( 0x27F0, 0x27FF, SvxResId(RID_SUBSETSTR_SUPPL_ARROWS_A) ) );
+ aAllSubsets.emplace_back( 0x27F0, 0x27FF, SvxResId(RID_SUBSETSTR_SUPPL_ARROWS_A) );
break;
case UBLOCK_SUPPLEMENTAL_ARROWS_B:
- aAllSubsets.push_back( Subset( 0x2900, 0x297F, SvxResId(RID_SUBSETSTR_SUPPL_ARROWS_B) ) );
+ aAllSubsets.emplace_back( 0x2900, 0x297F, SvxResId(RID_SUBSETSTR_SUPPL_ARROWS_B) );
break;
case UBLOCK_MISCELLANEOUS_MATHEMATICAL_SYMBOLS_B:
- aAllSubsets.push_back( Subset( 0x2980, 0x29FF, SvxResId(RID_SUBSETSTR_MISC_MATH_SYMS_B) ) );
+ aAllSubsets.emplace_back( 0x2980, 0x29FF, SvxResId(RID_SUBSETSTR_MISC_MATH_SYMS_B) );
break;
case UBLOCK_SUPPLEMENTAL_MATHEMATICAL_OPERATORS:
- aAllSubsets.push_back( Subset( 0x2A00, 0x2AFF, SvxResId(RID_SUBSETSTR_MISC_MATH_SYMS_B) ) );
+ aAllSubsets.emplace_back( 0x2A00, 0x2AFF, SvxResId(RID_SUBSETSTR_MISC_MATH_SYMS_B) );
break;
case UBLOCK_KATAKANA_PHONETIC_EXTENSIONS:
- aAllSubsets.push_back( Subset( 0x31F0, 0x31FF, SvxResId(RID_SUBSETSTR_KATAKANA_PHONETIC) ) );
+ aAllSubsets.emplace_back( 0x31F0, 0x31FF, SvxResId(RID_SUBSETSTR_KATAKANA_PHONETIC) );
break;
case UBLOCK_VARIATION_SELECTORS:
- aAllSubsets.push_back( Subset( 0xFE00, 0xFE0F, SvxResId(RID_SUBSETSTR_VARIATION_SELECTORS) ) );
+ aAllSubsets.emplace_back( 0xFE00, 0xFE0F, SvxResId(RID_SUBSETSTR_VARIATION_SELECTORS) );
break;
case UBLOCK_SUPPLEMENTARY_PRIVATE_USE_AREA_A:
- aAllSubsets.push_back( Subset( 0xF0000, 0xFFFFF, SvxResId(RID_SUBSETSTR_SUPPLEMENTARY_PRIVATE_USE_AREA_A) ) );
+ aAllSubsets.emplace_back( 0xF0000, 0xFFFFF, SvxResId(RID_SUBSETSTR_SUPPLEMENTARY_PRIVATE_USE_AREA_A) );
break;
case UBLOCK_SUPPLEMENTARY_PRIVATE_USE_AREA_B:
- aAllSubsets.push_back( Subset( 0x100000, 0x10FFFF, SvxResId(RID_SUBSETSTR_SUPPLEMENTARY_PRIVATE_USE_AREA_B) ) );
+ aAllSubsets.emplace_back( 0x100000, 0x10FFFF, SvxResId(RID_SUBSETSTR_SUPPLEMENTARY_PRIVATE_USE_AREA_B) );
break;
case UBLOCK_LIMBU:
- aAllSubsets.push_back( Subset( 0x1900, 0x194F, SvxResId(RID_SUBSETSTR_LIMBU) ) );
+ aAllSubsets.emplace_back( 0x1900, 0x194F, SvxResId(RID_SUBSETSTR_LIMBU) );
break;
case UBLOCK_TAI_LE:
- aAllSubsets.push_back( Subset( 0x1950, 0x197F, SvxResId(RID_SUBSETSTR_TAI_LE) ) );
+ aAllSubsets.emplace_back( 0x1950, 0x197F, SvxResId(RID_SUBSETSTR_TAI_LE) );
break;
case UBLOCK_KHMER_SYMBOLS:
- aAllSubsets.push_back( Subset( 0x19E0, 0x19FF, SvxResId(RID_SUBSETSTR_KHMER_SYMBOLS) ) );
+ aAllSubsets.emplace_back( 0x19E0, 0x19FF, SvxResId(RID_SUBSETSTR_KHMER_SYMBOLS) );
break;
case UBLOCK_PHONETIC_EXTENSIONS:
- aAllSubsets.push_back( Subset( 0x1D00, 0x1D7F, SvxResId(RID_SUBSETSTR_PHONETIC_EXTENSIONS) ) );
+ aAllSubsets.emplace_back( 0x1D00, 0x1D7F, SvxResId(RID_SUBSETSTR_PHONETIC_EXTENSIONS) );
break;
case UBLOCK_MISCELLANEOUS_SYMBOLS_AND_ARROWS:
- aAllSubsets.push_back( Subset( 0x2B00, 0x2BFF, SvxResId(RID_SUBSETSTR_MISCELLANEOUS_SYMBOLS_AND_ARROWS) ) );
+ aAllSubsets.emplace_back( 0x2B00, 0x2BFF, SvxResId(RID_SUBSETSTR_MISCELLANEOUS_SYMBOLS_AND_ARROWS) );
break;
case UBLOCK_YIJING_HEXAGRAM_SYMBOLS:
- aAllSubsets.push_back( Subset( 0x4DC0, 0x4DFF, SvxResId(RID_SUBSETSTR_YIJING_HEXAGRAM_SYMBOLS) ) );
+ aAllSubsets.emplace_back( 0x4DC0, 0x4DFF, SvxResId(RID_SUBSETSTR_YIJING_HEXAGRAM_SYMBOLS) );
break;
case UBLOCK_LINEAR_B_SYLLABARY:
- aAllSubsets.push_back( Subset( 0x10000, 0x1007F, SvxResId(RID_SUBSETSTR_LINEAR_B_SYLLABARY) ) );
+ aAllSubsets.emplace_back( 0x10000, 0x1007F, SvxResId(RID_SUBSETSTR_LINEAR_B_SYLLABARY) );
break;
case UBLOCK_LINEAR_B_IDEOGRAMS:
- aAllSubsets.push_back( Subset( 0x10080, 0x100FF, SvxResId(RID_SUBSETSTR_LINEAR_B_IDEOGRAMS) ) );
+ aAllSubsets.emplace_back( 0x10080, 0x100FF, SvxResId(RID_SUBSETSTR_LINEAR_B_IDEOGRAMS) );
break;
case UBLOCK_AEGEAN_NUMBERS:
- aAllSubsets.push_back( Subset( 0x10100, 0x1013F, SvxResId(RID_SUBSETSTR_AEGEAN_NUMBERS) ) );
+ aAllSubsets.emplace_back( 0x10100, 0x1013F, SvxResId(RID_SUBSETSTR_AEGEAN_NUMBERS) );
break;
case UBLOCK_UGARITIC:
- aAllSubsets.push_back( Subset( 0x10380, 0x1039F, SvxResId(RID_SUBSETSTR_UGARITIC) ) );
+ aAllSubsets.emplace_back( 0x10380, 0x1039F, SvxResId(RID_SUBSETSTR_UGARITIC) );
break;
case UBLOCK_SHAVIAN:
- aAllSubsets.push_back( Subset( 0x10450, 0x1047F, SvxResId(RID_SUBSETSTR_SHAVIAN) ) );
+ aAllSubsets.emplace_back( 0x10450, 0x1047F, SvxResId(RID_SUBSETSTR_SHAVIAN) );
break;
case UBLOCK_OSMANYA:
- aAllSubsets.push_back( Subset( 0x10480, 0x104AF, SvxResId(RID_SUBSETSTR_OSMANYA) ) );
+ aAllSubsets.emplace_back( 0x10480, 0x104AF, SvxResId(RID_SUBSETSTR_OSMANYA) );
break;
case UBLOCK_CYPRIOT_SYLLABARY:
- aAllSubsets.push_back( Subset( 0x10800, 0x1083F, SvxResId(RID_SUBSETSTR_CYPRIOT_SYLLABARY) ) );
+ aAllSubsets.emplace_back( 0x10800, 0x1083F, SvxResId(RID_SUBSETSTR_CYPRIOT_SYLLABARY) );
break;
case UBLOCK_TAI_XUAN_JING_SYMBOLS:
- aAllSubsets.push_back( Subset( 0x1D300, 0x1D35F, SvxResId(RID_SUBSETSTR_TAI_XUAN_JING_SYMBOLS) ) );
+ aAllSubsets.emplace_back( 0x1D300, 0x1D35F, SvxResId(RID_SUBSETSTR_TAI_XUAN_JING_SYMBOLS) );
break;
case UBLOCK_VARIATION_SELECTORS_SUPPLEMENT:
- aAllSubsets.push_back( Subset( 0xE0100, 0xE01EF, SvxResId(RID_SUBSETSTR_VARIATION_SELECTORS_SUPPLEMENT) ) );
+ aAllSubsets.emplace_back( 0xE0100, 0xE01EF, SvxResId(RID_SUBSETSTR_VARIATION_SELECTORS_SUPPLEMENT) );
break;
case UBLOCK_ANCIENT_GREEK_MUSICAL_NOTATION:
- aAllSubsets.push_back( Subset(0x1D200, 0x1D24F, SvxResId(RID_SUBSETSTR_ANCIENT_GREEK_MUSICAL_NOTATION) ) );
+ aAllSubsets.emplace_back(0x1D200, 0x1D24F, SvxResId(RID_SUBSETSTR_ANCIENT_GREEK_MUSICAL_NOTATION) );
break;
case UBLOCK_ANCIENT_GREEK_NUMBERS:
- aAllSubsets.push_back( Subset(0x10140, 0x1018F , SvxResId(RID_SUBSETSTR_ANCIENT_GREEK_NUMBERS) ) );
+ aAllSubsets.emplace_back(0x10140, 0x1018F , SvxResId(RID_SUBSETSTR_ANCIENT_GREEK_NUMBERS) );
break;
case UBLOCK_ARABIC_SUPPLEMENT:
- aAllSubsets.push_back( Subset(0x0750, 0x077F , SvxResId(RID_SUBSETSTR_ARABIC_SUPPLEMENT) ) );
+ aAllSubsets.emplace_back(0x0750, 0x077F , SvxResId(RID_SUBSETSTR_ARABIC_SUPPLEMENT) );
break;
case UBLOCK_BUGINESE:
- aAllSubsets.push_back( Subset(0x1A00, 0x1A1F , SvxResId(RID_SUBSETSTR_BUGINESE) ) );
+ aAllSubsets.emplace_back(0x1A00, 0x1A1F , SvxResId(RID_SUBSETSTR_BUGINESE) );
break;
case UBLOCK_CJK_STROKES:
- aAllSubsets.push_back( Subset( 0x31C0, 0x31EF, SvxResId(RID_SUBSETSTR_CJK_STROKES) ) );
+ aAllSubsets.emplace_back( 0x31C0, 0x31EF, SvxResId(RID_SUBSETSTR_CJK_STROKES) );
break;
case UBLOCK_COMBINING_DIACRITICAL_MARKS_SUPPLEMENT:
- aAllSubsets.push_back( Subset( 0x1DC0, 0x1DFF , SvxResId(RID_SUBSETSTR_COMBINING_DIACRITICAL_MARKS_SUPPLEMENT) ) );
+ aAllSubsets.emplace_back( 0x1DC0, 0x1DFF , SvxResId(RID_SUBSETSTR_COMBINING_DIACRITICAL_MARKS_SUPPLEMENT) );
break;
case UBLOCK_COPTIC:
- aAllSubsets.push_back( Subset( 0x2C80, 0x2CFF , SvxResId(RID_SUBSETSTR_COPTIC) ) );
+ aAllSubsets.emplace_back( 0x2C80, 0x2CFF , SvxResId(RID_SUBSETSTR_COPTIC) );
break;
case UBLOCK_ETHIOPIC_EXTENDED:
- aAllSubsets.push_back( Subset( 0x2D80, 0x2DDF , SvxResId(RID_SUBSETSTR_ETHIOPIC_EXTENDED) ) );
+ aAllSubsets.emplace_back( 0x2D80, 0x2DDF , SvxResId(RID_SUBSETSTR_ETHIOPIC_EXTENDED) );
break;
case UBLOCK_ETHIOPIC_SUPPLEMENT:
- aAllSubsets.push_back( Subset( 0x1380, 0x139F, SvxResId(RID_SUBSETSTR_ETHIOPIC_SUPPLEMENT) ) );
+ aAllSubsets.emplace_back( 0x1380, 0x139F, SvxResId(RID_SUBSETSTR_ETHIOPIC_SUPPLEMENT) );
break;
case UBLOCK_GEORGIAN_SUPPLEMENT:
- aAllSubsets.push_back( Subset( 0x2D00, 0x2D2F, SvxResId(RID_SUBSETSTR_GEORGIAN_SUPPLEMENT) ) );
+ aAllSubsets.emplace_back( 0x2D00, 0x2D2F, SvxResId(RID_SUBSETSTR_GEORGIAN_SUPPLEMENT) );
break;
case UBLOCK_GLAGOLITIC:
- aAllSubsets.push_back( Subset( 0x2C00, 0x2C5F, SvxResId(RID_SUBSETSTR_GLAGOLITIC) ) );
+ aAllSubsets.emplace_back( 0x2C00, 0x2C5F, SvxResId(RID_SUBSETSTR_GLAGOLITIC) );
break;
case UBLOCK_KHAROSHTHI:
- aAllSubsets.push_back( Subset( 0x10A00, 0x10A5F, SvxResId(RID_SUBSETSTR_KHAROSHTHI) ) );
+ aAllSubsets.emplace_back( 0x10A00, 0x10A5F, SvxResId(RID_SUBSETSTR_KHAROSHTHI) );
break;
case UBLOCK_MODIFIER_TONE_LETTERS:
- aAllSubsets.push_back( Subset( 0xA700, 0xA71F, SvxResId(RID_SUBSETSTR_MODIFIER_TONE_LETTERS) ) );
+ aAllSubsets.emplace_back( 0xA700, 0xA71F, SvxResId(RID_SUBSETSTR_MODIFIER_TONE_LETTERS) );
break;
case UBLOCK_NEW_TAI_LUE:
- aAllSubsets.push_back( Subset( 0x1980, 0x19DF, SvxResId(RID_SUBSETSTR_NEW_TAI_LUE) ) );
+ aAllSubsets.emplace_back( 0x1980, 0x19DF, SvxResId(RID_SUBSETSTR_NEW_TAI_LUE) );
break;
case UBLOCK_OLD_PERSIAN:
- aAllSubsets.push_back( Subset( 0x103A0, 0x103DF, SvxResId(RID_SUBSETSTR_OLD_PERSIAN) ) );
+ aAllSubsets.emplace_back( 0x103A0, 0x103DF, SvxResId(RID_SUBSETSTR_OLD_PERSIAN) );
break;
case UBLOCK_PHONETIC_EXTENSIONS_SUPPLEMENT:
- aAllSubsets.push_back( Subset( 0x1D80, 0x1DBF, SvxResId(RID_SUBSETSTR_PHONETIC_EXTENSIONS_SUPPLEMENT) ) );
+ aAllSubsets.emplace_back( 0x1D80, 0x1DBF, SvxResId(RID_SUBSETSTR_PHONETIC_EXTENSIONS_SUPPLEMENT) );
break;
case UBLOCK_SUPPLEMENTAL_PUNCTUATION:
- aAllSubsets.push_back( Subset( 0x2E00, 0x2E7F, SvxResId(RID_SUBSETSTR_SUPPLEMENTAL_PUNCTUATION) ) );
+ aAllSubsets.emplace_back( 0x2E00, 0x2E7F, SvxResId(RID_SUBSETSTR_SUPPLEMENTAL_PUNCTUATION) );
break;
case UBLOCK_SYLOTI_NAGRI:
- aAllSubsets.push_back( Subset( 0xA800, 0xA82F, SvxResId(RID_SUBSETSTR_SYLOTI_NAGRI) ) );
+ aAllSubsets.emplace_back( 0xA800, 0xA82F, SvxResId(RID_SUBSETSTR_SYLOTI_NAGRI) );
break;
case UBLOCK_TIFINAGH:
- aAllSubsets.push_back( Subset( 0x2D30, 0x2D7F, SvxResId(RID_SUBSETSTR_TIFINAGH) ) );
+ aAllSubsets.emplace_back( 0x2D30, 0x2D7F, SvxResId(RID_SUBSETSTR_TIFINAGH) );
break;
case UBLOCK_VERTICAL_FORMS:
- aAllSubsets.push_back( Subset( 0xFE10, 0xFE1F, SvxResId(RID_SUBSETSTR_VERTICAL_FORMS) ) );
+ aAllSubsets.emplace_back( 0xFE10, 0xFE1F, SvxResId(RID_SUBSETSTR_VERTICAL_FORMS) );
break;
case UBLOCK_NKO:
- aAllSubsets.push_back( Subset( 0x07C0, 0x07FF, SvxResId(RID_SUBSETSTR_NKO) ) );
+ aAllSubsets.emplace_back( 0x07C0, 0x07FF, SvxResId(RID_SUBSETSTR_NKO) );
break;
case UBLOCK_BALINESE:
- aAllSubsets.push_back( Subset( 0x1B00, 0x1B7F, SvxResId(RID_SUBSETSTR_BALINESE) ) );
+ aAllSubsets.emplace_back( 0x1B00, 0x1B7F, SvxResId(RID_SUBSETSTR_BALINESE) );
break;
case UBLOCK_LATIN_EXTENDED_C:
- aAllSubsets.push_back( Subset( 0x2C60, 0x2C7F, SvxResId(RID_SUBSETSTR_LATIN_EXTENDED_C) ) );
+ aAllSubsets.emplace_back( 0x2C60, 0x2C7F, SvxResId(RID_SUBSETSTR_LATIN_EXTENDED_C) );
break;
case UBLOCK_LATIN_EXTENDED_D:
- aAllSubsets.push_back( Subset( 0xA720, 0xA7FF, SvxResId(RID_SUBSETSTR_LATIN_EXTENDED_D) ) );
+ aAllSubsets.emplace_back( 0xA720, 0xA7FF, SvxResId(RID_SUBSETSTR_LATIN_EXTENDED_D) );
break;
case UBLOCK_PHAGS_PA:
- aAllSubsets.push_back( Subset( 0xA840, 0xA87F, SvxResId(RID_SUBSETSTR_PHAGS_PA) ) );
+ aAllSubsets.emplace_back( 0xA840, 0xA87F, SvxResId(RID_SUBSETSTR_PHAGS_PA) );
break;
case UBLOCK_PHOENICIAN:
- aAllSubsets.push_back( Subset( 0x10900, 0x1091F, SvxResId(RID_SUBSETSTR_PHOENICIAN) ) );
+ aAllSubsets.emplace_back( 0x10900, 0x1091F, SvxResId(RID_SUBSETSTR_PHOENICIAN) );
break;
case UBLOCK_CUNEIFORM:
- aAllSubsets.push_back( Subset( 0x12000, 0x123FF, SvxResId(RID_SUBSETSTR_CUNEIFORM) ) );
+ aAllSubsets.emplace_back( 0x12000, 0x123FF, SvxResId(RID_SUBSETSTR_CUNEIFORM) );
break;
case UBLOCK_CUNEIFORM_NUMBERS_AND_PUNCTUATION:
- aAllSubsets.push_back( Subset( 0x12400, 0x1247F, SvxResId(RID_SUBSETSTR_CUNEIFORM_NUMBERS_AND_PUNCTUATION) ) );
+ aAllSubsets.emplace_back( 0x12400, 0x1247F, SvxResId(RID_SUBSETSTR_CUNEIFORM_NUMBERS_AND_PUNCTUATION) );
break;
case UBLOCK_COUNTING_ROD_NUMERALS:
- aAllSubsets.push_back( Subset( 0x1D360, 0x1D37F, SvxResId(RID_SUBSETSTR_COUNTING_ROD_NUMERALS) ) );
+ aAllSubsets.emplace_back( 0x1D360, 0x1D37F, SvxResId(RID_SUBSETSTR_COUNTING_ROD_NUMERALS) );
break;
case UBLOCK_SUNDANESE:
- aAllSubsets.push_back( Subset( 0x1B80, 0x1BBF, SvxResId(RID_SUBSETSTR_SUNDANESE) ) );
+ aAllSubsets.emplace_back( 0x1B80, 0x1BBF, SvxResId(RID_SUBSETSTR_SUNDANESE) );
break;
case UBLOCK_LEPCHA:
- aAllSubsets.push_back( Subset( 0x1C00, 0x1C4F, SvxResId(RID_SUBSETSTR_LEPCHA) ) );
+ aAllSubsets.emplace_back( 0x1C00, 0x1C4F, SvxResId(RID_SUBSETSTR_LEPCHA) );
break;
case UBLOCK_OL_CHIKI:
- aAllSubsets.push_back( Subset( 0x1C50, 0x1C7F, SvxResId(RID_SUBSETSTR_OL_CHIKI) ) );
+ aAllSubsets.emplace_back( 0x1C50, 0x1C7F, SvxResId(RID_SUBSETSTR_OL_CHIKI) );
break;
case UBLOCK_CYRILLIC_EXTENDED_A:
- aAllSubsets.push_back( Subset( 0x2DE0, 0x2DFF, SvxResId(RID_SUBSETSTR_CYRILLIC_EXTENDED_A) ) );
+ aAllSubsets.emplace_back( 0x2DE0, 0x2DFF, SvxResId(RID_SUBSETSTR_CYRILLIC_EXTENDED_A) );
break;
case UBLOCK_VAI:
- aAllSubsets.push_back( Subset( 0xA500, 0xA63F, SvxResId(RID_SUBSETSTR_VAI) ) );
+ aAllSubsets.emplace_back( 0xA500, 0xA63F, SvxResId(RID_SUBSETSTR_VAI) );
break;
case UBLOCK_CYRILLIC_EXTENDED_B:
- aAllSubsets.push_back( Subset( 0xA640, 0xA69F, SvxResId(RID_SUBSETSTR_CYRILLIC_EXTENDED_B) ) );
+ aAllSubsets.emplace_back( 0xA640, 0xA69F, SvxResId(RID_SUBSETSTR_CYRILLIC_EXTENDED_B) );
break;
case UBLOCK_SAURASHTRA:
- aAllSubsets.push_back( Subset( 0xA880, 0xA8DF, SvxResId(RID_SUBSETSTR_SAURASHTRA) ) );
+ aAllSubsets.emplace_back( 0xA880, 0xA8DF, SvxResId(RID_SUBSETSTR_SAURASHTRA) );
break;
case UBLOCK_KAYAH_LI:
- aAllSubsets.push_back( Subset( 0xA900, 0xA92F, SvxResId(RID_SUBSETSTR_KAYAH_LI) ) );
+ aAllSubsets.emplace_back( 0xA900, 0xA92F, SvxResId(RID_SUBSETSTR_KAYAH_LI) );
break;
case UBLOCK_REJANG:
- aAllSubsets.push_back( Subset( 0xA930, 0xA95F, SvxResId(RID_SUBSETSTR_REJANG) ) );
+ aAllSubsets.emplace_back( 0xA930, 0xA95F, SvxResId(RID_SUBSETSTR_REJANG) );
break;
case UBLOCK_CHAM:
- aAllSubsets.push_back( Subset( 0xAA00, 0xAA5F, SvxResId(RID_SUBSETSTR_CHAM) ) );
+ aAllSubsets.emplace_back( 0xAA00, 0xAA5F, SvxResId(RID_SUBSETSTR_CHAM) );
break;
case UBLOCK_ANCIENT_SYMBOLS:
- aAllSubsets.push_back( Subset( 0x10190, 0x101CF, SvxResId(RID_SUBSETSTR_ANCIENT_SYMBOLS) ) );
+ aAllSubsets.emplace_back( 0x10190, 0x101CF, SvxResId(RID_SUBSETSTR_ANCIENT_SYMBOLS) );
break;
case UBLOCK_PHAISTOS_DISC:
- aAllSubsets.push_back( Subset( 0x101D0, 0x101FF, SvxResId(RID_SUBSETSTR_PHAISTOS_DISC) ) );
+ aAllSubsets.emplace_back( 0x101D0, 0x101FF, SvxResId(RID_SUBSETSTR_PHAISTOS_DISC) );
break;
case UBLOCK_LYCIAN:
- aAllSubsets.push_back( Subset( 0x10280, 0x1029F, SvxResId(RID_SUBSETSTR_LYCIAN) ) );
+ aAllSubsets.emplace_back( 0x10280, 0x1029F, SvxResId(RID_SUBSETSTR_LYCIAN) );
break;
case UBLOCK_CARIAN:
- aAllSubsets.push_back( Subset( 0x102A0, 0x102DF, SvxResId(RID_SUBSETSTR_CARIAN) ) );
+ aAllSubsets.emplace_back( 0x102A0, 0x102DF, SvxResId(RID_SUBSETSTR_CARIAN) );
break;
case UBLOCK_LYDIAN:
- aAllSubsets.push_back( Subset( 0x10920, 0x1093F, SvxResId(RID_SUBSETSTR_LYDIAN) ) );
+ aAllSubsets.emplace_back( 0x10920, 0x1093F, SvxResId(RID_SUBSETSTR_LYDIAN) );
break;
case UBLOCK_MAHJONG_TILES:
- aAllSubsets.push_back( Subset( 0x1F000, 0x1F02F, SvxResId(RID_SUBSETSTR_MAHJONG_TILES) ) );
+ aAllSubsets.emplace_back( 0x1F000, 0x1F02F, SvxResId(RID_SUBSETSTR_MAHJONG_TILES) );
break;
case UBLOCK_DOMINO_TILES:
- aAllSubsets.push_back( Subset( 0x1F030, 0x1F09F, SvxResId(RID_SUBSETSTR_DOMINO_TILES) ) );
+ aAllSubsets.emplace_back( 0x1F030, 0x1F09F, SvxResId(RID_SUBSETSTR_DOMINO_TILES) );
break;
#if (U_ICU_VERSION_MAJOR_NUM > 4) || (U_ICU_VERSION_MAJOR_NUM == 4 && U_ICU_VERSION_MINOR_NUM >= 4)
case UBLOCK_SAMARITAN:
- aAllSubsets.push_back( Subset( 0x0800, 0x083F, SvxResId(RID_SUBSETSTR_SAMARITAN) ) );
+ aAllSubsets.emplace_back( 0x0800, 0x083F, SvxResId(RID_SUBSETSTR_SAMARITAN) );
break;
case UBLOCK_UNIFIED_CANADIAN_ABORIGINAL_SYLLABICS_EXTENDED:
- aAllSubsets.push_back( Subset( 0x18B0, 0x18FF, SvxResId(RID_SUBSETSTR_UNIFIED_CANADIAN_ABORIGINAL_SYLLABICS_EXTENDED) ) );
+ aAllSubsets.emplace_back( 0x18B0, 0x18FF, SvxResId(RID_SUBSETSTR_UNIFIED_CANADIAN_ABORIGINAL_SYLLABICS_EXTENDED) );
break;
case UBLOCK_TAI_THAM:
- aAllSubsets.push_back( Subset( 0x1A20, 0x1AAF, SvxResId(RID_SUBSETSTR_TAI_THAM) ) );
+ aAllSubsets.emplace_back( 0x1A20, 0x1AAF, SvxResId(RID_SUBSETSTR_TAI_THAM) );
break;
case UBLOCK_VEDIC_EXTENSIONS:
- aAllSubsets.push_back( Subset( 0x1CD0, 0x1CFF, SvxResId(RID_SUBSETSTR_VEDIC_EXTENSIONS) ) );
+ aAllSubsets.emplace_back( 0x1CD0, 0x1CFF, SvxResId(RID_SUBSETSTR_VEDIC_EXTENSIONS) );
break;
case UBLOCK_LISU:
- aAllSubsets.push_back( Subset( 0xA4D0, 0xA4FF, SvxResId(RID_SUBSETSTR_LISU) ) );
+ aAllSubsets.emplace_back( 0xA4D0, 0xA4FF, SvxResId(RID_SUBSETSTR_LISU) );
break;
case UBLOCK_BAMUM:
- aAllSubsets.push_back( Subset( 0xA6A0, 0xA6FF, SvxResId(RID_SUBSETSTR_BAMUM) ) );
+ aAllSubsets.emplace_back( 0xA6A0, 0xA6FF, SvxResId(RID_SUBSETSTR_BAMUM) );
break;
case UBLOCK_COMMON_INDIC_NUMBER_FORMS:
- aAllSubsets.push_back( Subset( 0xA830, 0xA83F, SvxResId(RID_SUBSETSTR_COMMON_INDIC_NUMBER_FORMS) ) );
+ aAllSubsets.emplace_back( 0xA830, 0xA83F, SvxResId(RID_SUBSETSTR_COMMON_INDIC_NUMBER_FORMS) );
break;
case UBLOCK_DEVANAGARI_EXTENDED:
- aAllSubsets.push_back( Subset( 0xA8E0, 0xA8FF, SvxResId(RID_SUBSETSTR_DEVANAGARI_EXTENDED) ) );
+ aAllSubsets.emplace_back( 0xA8E0, 0xA8FF, SvxResId(RID_SUBSETSTR_DEVANAGARI_EXTENDED) );
break;
case UBLOCK_HANGUL_JAMO_EXTENDED_A:
- aAllSubsets.push_back( Subset( 0xA960, 0xA97F, SvxResId(RID_SUBSETSTR_HANGUL_JAMO_EXTENDED_A) ) );
+ aAllSubsets.emplace_back( 0xA960, 0xA97F, SvxResId(RID_SUBSETSTR_HANGUL_JAMO_EXTENDED_A) );
break;
case UBLOCK_JAVANESE:
- aAllSubsets.push_back( Subset( 0xA980, 0xA9DF, SvxResId(RID_SUBSETSTR_JAVANESE) ) );
+ aAllSubsets.emplace_back( 0xA980, 0xA9DF, SvxResId(RID_SUBSETSTR_JAVANESE) );
break;
case UBLOCK_MYANMAR_EXTENDED_A:
- aAllSubsets.push_back( Subset( 0xAA60, 0xAA7F, SvxResId(RID_SUBSETSTR_MYANMAR_EXTENDED_A) ) );
+ aAllSubsets.emplace_back( 0xAA60, 0xAA7F, SvxResId(RID_SUBSETSTR_MYANMAR_EXTENDED_A) );
break;
case UBLOCK_TAI_VIET:
- aAllSubsets.push_back( Subset( 0xAA80, 0xAADF, SvxResId(RID_SUBSETSTR_TAI_VIET) ) );
+ aAllSubsets.emplace_back( 0xAA80, 0xAADF, SvxResId(RID_SUBSETSTR_TAI_VIET) );
break;
case UBLOCK_MEETEI_MAYEK:
- aAllSubsets.push_back( Subset( 0xABC0, 0xABFF, SvxResId(RID_SUBSETSTR_MEETEI_MAYEK) ) );
+ aAllSubsets.emplace_back( 0xABC0, 0xABFF, SvxResId(RID_SUBSETSTR_MEETEI_MAYEK) );
break;
case UBLOCK_HANGUL_JAMO_EXTENDED_B:
- aAllSubsets.push_back( Subset( 0xD7B0, 0xD7FF, SvxResId(RID_SUBSETSTR_HANGUL_JAMO_EXTENDED_B) ) );
+ aAllSubsets.emplace_back( 0xD7B0, 0xD7FF, SvxResId(RID_SUBSETSTR_HANGUL_JAMO_EXTENDED_B) );
break;
case UBLOCK_IMPERIAL_ARAMAIC:
- aAllSubsets.push_back( Subset( 0x10840, 0x1085F, SvxResId(RID_SUBSETSTR_IMPERIAL_ARAMAIC) ) );
+ aAllSubsets.emplace_back( 0x10840, 0x1085F, SvxResId(RID_SUBSETSTR_IMPERIAL_ARAMAIC) );
break;
case UBLOCK_OLD_SOUTH_ARABIAN:
- aAllSubsets.push_back( Subset( 0x10A60, 0x10A7F, SvxResId(RID_SUBSETSTR_OLD_SOUTH_ARABIAN) ) );
+ aAllSubsets.emplace_back( 0x10A60, 0x10A7F, SvxResId(RID_SUBSETSTR_OLD_SOUTH_ARABIAN) );
break;
case UBLOCK_AVESTAN:
- aAllSubsets.push_back( Subset( 0x10B00, 0x10B3F, SvxResId(RID_SUBSETSTR_AVESTAN) ) );
+ aAllSubsets.emplace_back( 0x10B00, 0x10B3F, SvxResId(RID_SUBSETSTR_AVESTAN) );
break;
case UBLOCK_INSCRIPTIONAL_PARTHIAN:
- aAllSubsets.push_back( Subset( 0x10B40, 0x10B5F, SvxResId(RID_SUBSETSTR_INSCRIPTIONAL_PARTHIAN) ) );
+ aAllSubsets.emplace_back( 0x10B40, 0x10B5F, SvxResId(RID_SUBSETSTR_INSCRIPTIONAL_PARTHIAN) );
break;
case UBLOCK_INSCRIPTIONAL_PAHLAVI:
- aAllSubsets.push_back( Subset( 0x10B60, 0x10B7F, SvxResId(RID_SUBSETSTR_INSCRIPTIONAL_PAHLAVI) ) );
+ aAllSubsets.emplace_back( 0x10B60, 0x10B7F, SvxResId(RID_SUBSETSTR_INSCRIPTIONAL_PAHLAVI) );
break;
case UBLOCK_OLD_TURKIC:
- aAllSubsets.push_back( Subset( 0x10C00, 0x10C4F, SvxResId(RID_SUBSETSTR_OLD_TURKIC) ) );
+ aAllSubsets.emplace_back( 0x10C00, 0x10C4F, SvxResId(RID_SUBSETSTR_OLD_TURKIC) );
break;
case UBLOCK_RUMI_NUMERAL_SYMBOLS:
- aAllSubsets.push_back( Subset( 0x10E60, 0x10E7F, SvxResId(RID_SUBSETSTR_RUMI_NUMERAL_SYMBOLS) ) );
+ aAllSubsets.emplace_back( 0x10E60, 0x10E7F, SvxResId(RID_SUBSETSTR_RUMI_NUMERAL_SYMBOLS) );
break;
case UBLOCK_KAITHI:
- aAllSubsets.push_back( Subset( 0x11080, 0x110CF, SvxResId(RID_SUBSETSTR_KAITHI) ) );
+ aAllSubsets.emplace_back( 0x11080, 0x110CF, SvxResId(RID_SUBSETSTR_KAITHI) );
break;
case UBLOCK_EGYPTIAN_HIEROGLYPHS:
- aAllSubsets.push_back( Subset( 0x13000, 0x1342F, SvxResId(RID_SUBSETSTR_EGYPTIAN_HIEROGLYPHS) ) );
+ aAllSubsets.emplace_back( 0x13000, 0x1342F, SvxResId(RID_SUBSETSTR_EGYPTIAN_HIEROGLYPHS) );
break;
case UBLOCK_ENCLOSED_ALPHANUMERIC_SUPPLEMENT:
- aAllSubsets.push_back( Subset( 0x1F100, 0x1F1FF, SvxResId(RID_SUBSETSTR_ENCLOSED_ALPHANUMERIC_SUPPLEMENT) ) );
+ aAllSubsets.emplace_back( 0x1F100, 0x1F1FF, SvxResId(RID_SUBSETSTR_ENCLOSED_ALPHANUMERIC_SUPPLEMENT) );
break;
case UBLOCK_ENCLOSED_IDEOGRAPHIC_SUPPLEMENT:
- aAllSubsets.push_back( Subset( 0x1F200, 0x1F2FF, SvxResId(RID_SUBSETSTR_ENCLOSED_IDEOGRAPHIC_SUPPLEMENT) ) );
+ aAllSubsets.emplace_back( 0x1F200, 0x1F2FF, SvxResId(RID_SUBSETSTR_ENCLOSED_IDEOGRAPHIC_SUPPLEMENT) );
break;
case UBLOCK_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_C:
- aAllSubsets.push_back( Subset( 0x2A700, 0x2B73F, SvxResId(RID_SUBSETSTR_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_C) ) );
+ aAllSubsets.emplace_back( 0x2A700, 0x2B73F, SvxResId(RID_SUBSETSTR_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_C) );
break;
#endif
#if (U_ICU_VERSION_MAJOR_NUM > 4) || (U_ICU_VERSION_MAJOR_NUM == 4 && U_ICU_VERSION_MINOR_NUM >= 6)
case UBLOCK_MANDAIC:
- aAllSubsets.push_back( Subset( 0x0840, 0x085F, SvxResId(RID_SUBSETSTR_MANDAIC) ) );
+ aAllSubsets.emplace_back( 0x0840, 0x085F, SvxResId(RID_SUBSETSTR_MANDAIC) );
break;
case UBLOCK_BATAK:
- aAllSubsets.push_back( Subset( 0x1BC0, 0x1BFF, SvxResId(RID_SUBSETSTR_BATAK) ) );
+ aAllSubsets.emplace_back( 0x1BC0, 0x1BFF, SvxResId(RID_SUBSETSTR_BATAK) );
break;
case UBLOCK_ETHIOPIC_EXTENDED_A:
- aAllSubsets.push_back( Subset( 0xAB00, 0xAB2F, SvxResId(RID_SUBSETSTR_ETHIOPIC_EXTENDED_A) ) );
+ aAllSubsets.emplace_back( 0xAB00, 0xAB2F, SvxResId(RID_SUBSETSTR_ETHIOPIC_EXTENDED_A) );
break;
case UBLOCK_BRAHMI:
- aAllSubsets.push_back( Subset( 0x11000, 0x1107F, SvxResId(RID_SUBSETSTR_BRAHMI) ) );
+ aAllSubsets.emplace_back( 0x11000, 0x1107F, SvxResId(RID_SUBSETSTR_BRAHMI) );
break;
case UBLOCK_BAMUM_SUPPLEMENT:
- aAllSubsets.push_back( Subset( 0x16800, 0x16A3F, SvxResId(RID_SUBSETSTR_BAMUM_SUPPLEMENT) ) );
+ aAllSubsets.emplace_back( 0x16800, 0x16A3F, SvxResId(RID_SUBSETSTR_BAMUM_SUPPLEMENT) );
break;
case UBLOCK_KANA_SUPPLEMENT:
- aAllSubsets.push_back( Subset( 0x1B000, 0x1B0FF, SvxResId(RID_SUBSETSTR_KANA_SUPPLEMENT) ) );
+ aAllSubsets.emplace_back( 0x1B000, 0x1B0FF, SvxResId(RID_SUBSETSTR_KANA_SUPPLEMENT) );
break;
case UBLOCK_PLAYING_CARDS:
- aAllSubsets.push_back( Subset( 0x1F0A0, 0x1F0FF, SvxResId(RID_SUBSETSTR_PLAYING_CARDS) ) );
+ aAllSubsets.emplace_back( 0x1F0A0, 0x1F0FF, SvxResId(RID_SUBSETSTR_PLAYING_CARDS) );
break;
case UBLOCK_MISCELLANEOUS_SYMBOLS_AND_PICTOGRAPHS:
- aAllSubsets.push_back( Subset( 0x1F300, 0x1F5FF, SvxResId(RID_SUBSETSTR_MISCELLANEOUS_SYMBOLS_AND_PICTOGRAPHS) ) );
+ aAllSubsets.emplace_back( 0x1F300, 0x1F5FF, SvxResId(RID_SUBSETSTR_MISCELLANEOUS_SYMBOLS_AND_PICTOGRAPHS) );
break;
case UBLOCK_EMOTICONS:
- aAllSubsets.push_back( Subset( 0x1F600, 0x1F64F, SvxResId(RID_SUBSETSTR_EMOTICONS) ) );
+ aAllSubsets.emplace_back( 0x1F600, 0x1F64F, SvxResId(RID_SUBSETSTR_EMOTICONS) );
break;
case UBLOCK_TRANSPORT_AND_MAP_SYMBOLS:
- aAllSubsets.push_back( Subset( 0x1F680, 0x1F6FF, SvxResId(RID_SUBSETSTR_TRANSPORT_AND_MAP_SYMBOLS) ) );
+ aAllSubsets.emplace_back( 0x1F680, 0x1F6FF, SvxResId(RID_SUBSETSTR_TRANSPORT_AND_MAP_SYMBOLS) );
break;
case UBLOCK_ALCHEMICAL_SYMBOLS:
- aAllSubsets.push_back( Subset( 0x1F700, 0x1F77F, SvxResId(RID_SUBSETSTR_ALCHEMICAL_SYMBOLS) ) );
+ aAllSubsets.emplace_back( 0x1F700, 0x1F77F, SvxResId(RID_SUBSETSTR_ALCHEMICAL_SYMBOLS) );
break;
case UBLOCK_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_D:
- aAllSubsets.push_back( Subset( 0x2B740, 0x2B81F, SvxResId(RID_SUBSETSTR_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_D) ) );
+ aAllSubsets.emplace_back( 0x2B740, 0x2B81F, SvxResId(RID_SUBSETSTR_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_D) );
break;
#endif
// Note ICU version 49 (NOT 4.9), so the MAJOR_NUM is two digits.
#if U_ICU_VERSION_MAJOR_NUM >= 49
case UBLOCK_ARABIC_EXTENDED_A:
- aAllSubsets.push_back( Subset( 0x08A0, 0x08FF, SvxResId(RID_SUBSETSTR_ARABIC_EXTENDED_A) ) );
+ aAllSubsets.emplace_back( 0x08A0, 0x08FF, SvxResId(RID_SUBSETSTR_ARABIC_EXTENDED_A) );
break;
case UBLOCK_ARABIC_MATHEMATICAL_ALPHABETIC_SYMBOLS:
- aAllSubsets.push_back( Subset( 0x1EE00, 0x1EEFF, SvxResId(RID_SUBSETSTR_ARABIC_MATHEMATICAL_ALPHABETIC_SYMBOLS) ) );
+ aAllSubsets.emplace_back( 0x1EE00, 0x1EEFF, SvxResId(RID_SUBSETSTR_ARABIC_MATHEMATICAL_ALPHABETIC_SYMBOLS) );
break;
case UBLOCK_CHAKMA:
- aAllSubsets.push_back( Subset( 0x11100, 0x1114F, SvxResId(RID_SUBSETSTR_CHAKMA) ) );
+ aAllSubsets.emplace_back( 0x11100, 0x1114F, SvxResId(RID_SUBSETSTR_CHAKMA) );
break;
case UBLOCK_MEETEI_MAYEK_EXTENSIONS:
- aAllSubsets.push_back( Subset( 0xAAE0, 0xAAFF, SvxResId(RID_SUBSETSTR_MEETEI_MAYEK_EXTENSIONS) ) );
+ aAllSubsets.emplace_back( 0xAAE0, 0xAAFF, SvxResId(RID_SUBSETSTR_MEETEI_MAYEK_EXTENSIONS) );
break;
case UBLOCK_MEROITIC_CURSIVE:
- aAllSubsets.push_back( Subset( 0x109A0, 0x109FF, SvxResId(RID_SUBSETSTR_MEROITIC_CURSIVE) ) );
+ aAllSubsets.emplace_back( 0x109A0, 0x109FF, SvxResId(RID_SUBSETSTR_MEROITIC_CURSIVE) );
break;
case UBLOCK_MEROITIC_HIEROGLYPHS:
- aAllSubsets.push_back( Subset( 0x10980, 0x1099F, SvxResId(RID_SUBSETSTR_MEROITIC_HIEROGLYPHS) ) );
+ aAllSubsets.emplace_back( 0x10980, 0x1099F, SvxResId(RID_SUBSETSTR_MEROITIC_HIEROGLYPHS) );
break;
case UBLOCK_MIAO:
- aAllSubsets.push_back( Subset( 0x16F00, 0x16F9F, SvxResId(RID_SUBSETSTR_MIAO) ) );
+ aAllSubsets.emplace_back( 0x16F00, 0x16F9F, SvxResId(RID_SUBSETSTR_MIAO) );
break;
case UBLOCK_SHARADA:
- aAllSubsets.push_back( Subset( 0x11180, 0x111DF, SvxResId(RID_SUBSETSTR_SHARADA) ) );
+ aAllSubsets.emplace_back( 0x11180, 0x111DF, SvxResId(RID_SUBSETSTR_SHARADA) );
break;
case UBLOCK_SORA_SOMPENG:
- aAllSubsets.push_back( Subset( 0x110D0, 0x110FF, SvxResId(RID_SUBSETSTR_SORA_SOMPENG) ) );
+ aAllSubsets.emplace_back( 0x110D0, 0x110FF, SvxResId(RID_SUBSETSTR_SORA_SOMPENG) );
break;
case UBLOCK_SUNDANESE_SUPPLEMENT:
- aAllSubsets.push_back( Subset( 0x1CC0, 0x1CCF, SvxResId(RID_SUBSETSTR_SUNDANESE_SUPPLEMENT) ) );
+ aAllSubsets.emplace_back( 0x1CC0, 0x1CCF, SvxResId(RID_SUBSETSTR_SUNDANESE_SUPPLEMENT) );
break;
case UBLOCK_TAKRI:
- aAllSubsets.push_back( Subset( 0x11680, 0x116CF, SvxResId(RID_SUBSETSTR_TAKRI) ) );
+ aAllSubsets.emplace_back( 0x11680, 0x116CF, SvxResId(RID_SUBSETSTR_TAKRI) );
break;
#endif
#if U_ICU_VERSION_MAJOR_NUM >= 54
case UBLOCK_BASSA_VAH:
- aAllSubsets.push_back( Subset( 0x16AD0, 0x16AFF, SvxResId(RID_SUBSETSTR_BASSA_VAH) ) );
+ aAllSubsets.emplace_back( 0x16AD0, 0x16AFF, SvxResId(RID_SUBSETSTR_BASSA_VAH) );
break;
case UBLOCK_CAUCASIAN_ALBANIAN:
- aAllSubsets.push_back( Subset( 0x10530, 0x1056F, SvxResId(RID_SUBSETSTR_CAUCASIAN_ALBANIAN) ) );
+ aAllSubsets.emplace_back( 0x10530, 0x1056F, SvxResId(RID_SUBSETSTR_CAUCASIAN_ALBANIAN) );
break;
case UBLOCK_COPTIC_EPACT_NUMBERS:
- aAllSubsets.push_back( Subset( 0x102E0, 0x102FF, SvxResId(RID_SUBSETSTR_COPTIC_EPACT_NUMBERS) ) );
+ aAllSubsets.emplace_back( 0x102E0, 0x102FF, SvxResId(RID_SUBSETSTR_COPTIC_EPACT_NUMBERS) );
break;
case UBLOCK_COMBINING_DIACRITICAL_MARKS_EXTENDED:
- aAllSubsets.push_back( Subset( 0x1AB0, 0x1AFF, SvxResId(RID_SUBSETSTR_COMBINING_DIACRITICAL_MARKS_EXTENDED) ) );
+ aAllSubsets.emplace_back( 0x1AB0, 0x1AFF, SvxResId(RID_SUBSETSTR_COMBINING_DIACRITICAL_MARKS_EXTENDED) );
break;
case UBLOCK_DUPLOYAN:
- aAllSubsets.push_back( Subset( 0x1BC00, 0x1BC9F, SvxResId(RID_SUBSETSTR_DUPLOYAN) ) );
+ aAllSubsets.emplace_back( 0x1BC00, 0x1BC9F, SvxResId(RID_SUBSETSTR_DUPLOYAN) );
break;
case UBLOCK_ELBASAN:
- aAllSubsets.push_back( Subset( 0x10500, 0x1052F, SvxResId(RID_SUBSETSTR_ELBASAN) ) );
+ aAllSubsets.emplace_back( 0x10500, 0x1052F, SvxResId(RID_SUBSETSTR_ELBASAN) );
break;
case UBLOCK_GEOMETRIC_SHAPES_EXTENDED:
- aAllSubsets.push_back( Subset( 0x1F780, 0x1F7FF, SvxResId(RID_SUBSETSTR_GEOMETRIC_SHAPES_EXTENDED) ) );
+ aAllSubsets.emplace_back( 0x1F780, 0x1F7FF, SvxResId(RID_SUBSETSTR_GEOMETRIC_SHAPES_EXTENDED) );
break;
case UBLOCK_GRANTHA:
- aAllSubsets.push_back( Subset( 0x11300, 0x1137F, SvxResId(RID_SUBSETSTR_GRANTHA) ) );
+ aAllSubsets.emplace_back( 0x11300, 0x1137F, SvxResId(RID_SUBSETSTR_GRANTHA) );
break;
case UBLOCK_KHOJKI:
- aAllSubsets.push_back( Subset( 0x11200, 0x1124F, SvxResId(RID_SUBSETSTR_KHOJKI) ) );
+ aAllSubsets.emplace_back( 0x11200, 0x1124F, SvxResId(RID_SUBSETSTR_KHOJKI) );
break;
case UBLOCK_KHUDAWADI:
- aAllSubsets.push_back( Subset( 0x112B0, 0x112FF, SvxResId(RID_SUBSETSTR_KHUDAWADI) ) );
+ aAllSubsets.emplace_back( 0x112B0, 0x112FF, SvxResId(RID_SUBSETSTR_KHUDAWADI) );
break;
case UBLOCK_LATIN_EXTENDED_E:
- aAllSubsets.push_back( Subset( 0xAB30, 0xAB6F, SvxResId(RID_SUBSETSTR_LATIN_EXTENDED_E) ) );
+ aAllSubsets.emplace_back( 0xAB30, 0xAB6F, SvxResId(RID_SUBSETSTR_LATIN_EXTENDED_E) );
break;
case UBLOCK_LINEAR_A:
- aAllSubsets.push_back( Subset( 0x10600, 0x1077F, SvxResId(RID_SUBSETSTR_LINEAR_A) ) );
+ aAllSubsets.emplace_back( 0x10600, 0x1077F, SvxResId(RID_SUBSETSTR_LINEAR_A) );
break;
case UBLOCK_MAHAJANI:
- aAllSubsets.push_back( Subset( 0x11150, 0x1117F, SvxResId(RID_SUBSETSTR_MAHAJANI) ) );
+ aAllSubsets.emplace_back( 0x11150, 0x1117F, SvxResId(RID_SUBSETSTR_MAHAJANI) );
break;
case UBLOCK_MANICHAEAN:
- aAllSubsets.push_back( Subset( 0x10AC0, 0x10AFF, SvxResId(RID_SUBSETSTR_MANICHAEAN) ) );
+ aAllSubsets.emplace_back( 0x10AC0, 0x10AFF, SvxResId(RID_SUBSETSTR_MANICHAEAN) );
break;
case UBLOCK_MENDE_KIKAKUI:
- aAllSubsets.push_back( Subset( 0x1E800, 0x1E8DF, SvxResId(RID_SUBSETSTR_MENDE_KIKAKUI) ) );
+ aAllSubsets.emplace_back( 0x1E800, 0x1E8DF, SvxResId(RID_SUBSETSTR_MENDE_KIKAKUI) );
break;
case UBLOCK_MODI:
- aAllSubsets.push_back( Subset( 0x11600, 0x1165F, SvxResId(RID_SUBSETSTR_MODI) ) );
+ aAllSubsets.emplace_back( 0x11600, 0x1165F, SvxResId(RID_SUBSETSTR_MODI) );
break;
case UBLOCK_MRO:
- aAllSubsets.push_back( Subset( 0x16A40, 0x16A6F, SvxResId(RID_SUBSETSTR_MRO) ) );
+ aAllSubsets.emplace_back( 0x16A40, 0x16A6F, SvxResId(RID_SUBSETSTR_MRO) );
break;
case UBLOCK_MYANMAR_EXTENDED_B:
- aAllSubsets.push_back( Subset( 0xA9E0, 0xA9FF, SvxResId(RID_SUBSETSTR_MYANMAR_EXTENDED_B) ) );
+ aAllSubsets.emplace_back( 0xA9E0, 0xA9FF, SvxResId(RID_SUBSETSTR_MYANMAR_EXTENDED_B) );
break;
case UBLOCK_NABATAEAN:
- aAllSubsets.push_back( Subset( 0x10880, 0x108AF, SvxResId(RID_SUBSETSTR_NABATAEAN) ) );
+ aAllSubsets.emplace_back( 0x10880, 0x108AF, SvxResId(RID_SUBSETSTR_NABATAEAN) );
break;
case UBLOCK_OLD_NORTH_ARABIAN:
- aAllSubsets.push_back( Subset( 0x10A80, 0x10A9F, SvxResId(RID_SUBSETSTR_OLD_NORTH_ARABIAN) ) );
+ aAllSubsets.emplace_back( 0x10A80, 0x10A9F, SvxResId(RID_SUBSETSTR_OLD_NORTH_ARABIAN) );
break;
case UBLOCK_OLD_PERMIC:
- aAllSubsets.push_back( Subset( 0x10350, 0x1037F, SvxResId(RID_SUBSETSTR_OLD_PERMIC) ) );
+ aAllSubsets.emplace_back( 0x10350, 0x1037F, SvxResId(RID_SUBSETSTR_OLD_PERMIC) );
break;
case UBLOCK_ORNAMENTAL_DINGBATS:
- aAllSubsets.push_back( Subset( 0x1F650, 0x1F67F, SvxResId(RID_SUBSETSTR_ORNAMENTAL_DINGBATS) ) );
+ aAllSubsets.emplace_back( 0x1F650, 0x1F67F, SvxResId(RID_SUBSETSTR_ORNAMENTAL_DINGBATS) );
break;
case UBLOCK_PAHAWH_HMONG:
- aAllSubsets.push_back( Subset( 0x16B00, 0x16B8F, SvxResId(RID_SUBSETSTR_PAHAWH_HMONG) ) );
+ aAllSubsets.emplace_back( 0x16B00, 0x16B8F, SvxResId(RID_SUBSETSTR_PAHAWH_HMONG) );
break;
case UBLOCK_PALMYRENE:
- aAllSubsets.push_back( Subset( 0x10860, 0x1087F, SvxResId(RID_SUBSETSTR_PALMYRENE) ) );
+ aAllSubsets.emplace_back( 0x10860, 0x1087F, SvxResId(RID_SUBSETSTR_PALMYRENE) );
break;
case UBLOCK_PAU_CIN_HAU:
- aAllSubsets.push_back( Subset( 0x11AC0, 0x11AFF, SvxResId(RID_SUBSETSTR_PAU_CIN_HAU) ) );
+ aAllSubsets.emplace_back( 0x11AC0, 0x11AFF, SvxResId(RID_SUBSETSTR_PAU_CIN_HAU) );
break;
case UBLOCK_PSALTER_PAHLAVI:
- aAllSubsets.push_back( Subset( 0x10B80, 0x10BAF, SvxResId(RID_SUBSETSTR_PSALTER_PAHLAVI) ) );
+ aAllSubsets.emplace_back( 0x10B80, 0x10BAF, SvxResId(RID_SUBSETSTR_PSALTER_PAHLAVI) );
break;
case UBLOCK_SHORTHAND_FORMAT_CONTROLS:
- aAllSubsets.push_back( Subset( 0x1BCA0, 0x1BCAF, SvxResId(RID_SUBSETSTR_SHORTHAND_FORMAT_CONTROLS) ) );
+ aAllSubsets.emplace_back( 0x1BCA0, 0x1BCAF, SvxResId(RID_SUBSETSTR_SHORTHAND_FORMAT_CONTROLS) );
break;
case UBLOCK_SIDDHAM:
- aAllSubsets.push_back( Subset( 0x11580, 0x115FF, SvxResId(RID_SUBSETSTR_SIDDHAM) ) );
+ aAllSubsets.emplace_back( 0x11580, 0x115FF, SvxResId(RID_SUBSETSTR_SIDDHAM) );
break;
case UBLOCK_SINHALA_ARCHAIC_NUMBERS:
- aAllSubsets.push_back( Subset( 0x111E0, 0x111FF, SvxResId(RID_SUBSETSTR_SINHALA_ARCHAIC_NUMBERS) ) );
+ aAllSubsets.emplace_back( 0x111E0, 0x111FF, SvxResId(RID_SUBSETSTR_SINHALA_ARCHAIC_NUMBERS) );
break;
case UBLOCK_SUPPLEMENTAL_ARROWS_C:
- aAllSubsets.push_back( Subset( 0x1F800, 0x1F8FF, SvxResId(RID_SUBSETSTR_SUPPLEMENTAL_ARROWS_C) ) );
+ aAllSubsets.emplace_back( 0x1F800, 0x1F8FF, SvxResId(RID_SUBSETSTR_SUPPLEMENTAL_ARROWS_C) );
break;
case UBLOCK_TIRHUTA:
- aAllSubsets.push_back( Subset( 0x11480, 0x114DF, SvxResId(RID_SUBSETSTR_TIRHUTA) ) );
+ aAllSubsets.emplace_back( 0x11480, 0x114DF, SvxResId(RID_SUBSETSTR_TIRHUTA) );
break;
case UBLOCK_WARANG_CITI:
- aAllSubsets.push_back( Subset( 0x118A0, 0x118FF, SvxResId(RID_SUBSETSTR_WARANG_CITI) ) );
+ aAllSubsets.emplace_back( 0x118A0, 0x118FF, SvxResId(RID_SUBSETSTR_WARANG_CITI) );
break;
#endif
#if U_ICU_VERSION_MAJOR_NUM >= 56
case UBLOCK_AHOM:
- aAllSubsets.push_back( Subset( 0x11700, 0x1173F, SvxResId(RID_SUBSETSTR_AHOM) ) );
+ aAllSubsets.emplace_back( 0x11700, 0x1173F, SvxResId(RID_SUBSETSTR_AHOM) );
break;
case UBLOCK_ANATOLIAN_HIEROGLYPHS:
- aAllSubsets.push_back( Subset( 0x14400, 0x1467F, SvxResId(RID_SUBSETSTR_ANATOLIAN_HIEROGLYPHS) ) );
+ aAllSubsets.emplace_back( 0x14400, 0x1467F, SvxResId(RID_SUBSETSTR_ANATOLIAN_HIEROGLYPHS) );
break;
case UBLOCK_CHEROKEE_SUPPLEMENT:
- aAllSubsets.push_back( Subset( 0xAB70, 0xABBF, SvxResId(RID_SUBSETSTR_CHEROKEE_SUPPLEMENT) ) );
+ aAllSubsets.emplace_back( 0xAB70, 0xABBF, SvxResId(RID_SUBSETSTR_CHEROKEE_SUPPLEMENT) );
break;
case UBLOCK_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_E:
- aAllSubsets.push_back( Subset( 0x2B820, 0x2CEAF, SvxResId(RID_SUBSETSTR_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_E) ) );
+ aAllSubsets.emplace_back( 0x2B820, 0x2CEAF, SvxResId(RID_SUBSETSTR_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_E) );
break;
case UBLOCK_EARLY_DYNASTIC_CUNEIFORM:
- aAllSubsets.push_back( Subset( 0x12480, 0x1254F, SvxResId(RID_SUBSETSTR_EARLY_DYNASTIC_CUNEIFORM) ) );
+ aAllSubsets.emplace_back( 0x12480, 0x1254F, SvxResId(RID_SUBSETSTR_EARLY_DYNASTIC_CUNEIFORM) );
break;
case UBLOCK_HATRAN:
- aAllSubsets.push_back( Subset( 0x108E0, 0x108FF, SvxResId(RID_SUBSETSTR_HATRAN) ) );
+ aAllSubsets.emplace_back( 0x108E0, 0x108FF, SvxResId(RID_SUBSETSTR_HATRAN) );
break;
case UBLOCK_MULTANI:
- aAllSubsets.push_back( Subset( 0x11280, 0x112AF, SvxResId(RID_SUBSETSTR_MULTANI) ) );
+ aAllSubsets.emplace_back( 0x11280, 0x112AF, SvxResId(RID_SUBSETSTR_MULTANI) );
break;
case UBLOCK_OLD_HUNGARIAN:
- aAllSubsets.push_back( Subset( 0x10C80, 0x10CFF, SvxResId(RID_SUBSETSTR_OLD_HUNGARIAN) ) );
+ aAllSubsets.emplace_back( 0x10C80, 0x10CFF, SvxResId(RID_SUBSETSTR_OLD_HUNGARIAN) );
break;
case UBLOCK_SUPPLEMENTAL_SYMBOLS_AND_PICTOGRAPHS:
- aAllSubsets.push_back( Subset( 0x1F900, 0x1F9FF, SvxResId(RID_SUBSETSTR_SUPPLEMENTAL_SYMBOLS_AND_PICTOGRAPHS) ) );
+ aAllSubsets.emplace_back( 0x1F900, 0x1F9FF, SvxResId(RID_SUBSETSTR_SUPPLEMENTAL_SYMBOLS_AND_PICTOGRAPHS) );
break;
case UBLOCK_SUTTON_SIGNWRITING:
- aAllSubsets.push_back( Subset( 0x1D800, 0x1DAAF, SvxResId(RID_SUBSETSTR_SUTTON_SIGNWRITING) ) );
+ aAllSubsets.emplace_back( 0x1D800, 0x1DAAF, SvxResId(RID_SUBSETSTR_SUTTON_SIGNWRITING) );
break;
#endif
#if (U_ICU_VERSION_MAJOR_NUM >= 58)
case UBLOCK_ADLAM:
- aAllSubsets.push_back( Subset( 0x1E900, 0x1E95F, SvxResId(RID_SUBSETSTR_ADLAM) ) );
+ aAllSubsets.emplace_back( 0x1E900, 0x1E95F, SvxResId(RID_SUBSETSTR_ADLAM) );
break;
case UBLOCK_BHAIKSUKI:
- aAllSubsets.push_back( Subset( 0x11C00, 0x11C6F, SvxResId(RID_SUBSETSTR_BHAIKSUKI) ) );
+ aAllSubsets.emplace_back( 0x11C00, 0x11C6F, SvxResId(RID_SUBSETSTR_BHAIKSUKI) );
break;
case UBLOCK_CYRILLIC_EXTENDED_C:
- aAllSubsets.push_back( Subset( 0x1C80, 0x1C8F, SvxResId(RID_SUBSETSTR_CYRILLIC_EXTENDED_C) ) );
+ aAllSubsets.emplace_back( 0x1C80, 0x1C8F, SvxResId(RID_SUBSETSTR_CYRILLIC_EXTENDED_C) );
break;
case UBLOCK_GLAGOLITIC_SUPPLEMENT:
- aAllSubsets.push_back( Subset( 0x1E000, 0x1E02F, SvxResId(RID_SUBSETSTR_GLAGOLITIC_SUPPLEMENT) ) );
+ aAllSubsets.emplace_back( 0x1E000, 0x1E02F, SvxResId(RID_SUBSETSTR_GLAGOLITIC_SUPPLEMENT) );
break;
case UBLOCK_IDEOGRAPHIC_SYMBOLS_AND_PUNCTUATION:
- aAllSubsets.push_back( Subset( 0x16FE0, 0x16FFF, SvxResId(RID_SUBSETSTR_IDEOGRAPHIC_SYMBOLS_AND_PUNCTUATION) ) );
+ aAllSubsets.emplace_back( 0x16FE0, 0x16FFF, SvxResId(RID_SUBSETSTR_IDEOGRAPHIC_SYMBOLS_AND_PUNCTUATION) );
break;
case UBLOCK_MARCHEN:
- aAllSubsets.push_back( Subset( 0x11C70, 0x11CBF, SvxResId(RID_SUBSETSTR_MARCHEN) ) );
+ aAllSubsets.emplace_back( 0x11C70, 0x11CBF, SvxResId(RID_SUBSETSTR_MARCHEN) );
break;
case UBLOCK_MONGOLIAN_SUPPLEMENT:
- aAllSubsets.push_back( Subset( 0x11660, 0x1167F, SvxResId(RID_SUBSETSTR_MONGOLIAN_SUPPLEMENT) ) );
+ aAllSubsets.emplace_back( 0x11660, 0x1167F, SvxResId(RID_SUBSETSTR_MONGOLIAN_SUPPLEMENT) );
break;
case UBLOCK_NEWA:
- aAllSubsets.push_back( Subset( 0x11400, 0x1147F, SvxResId(RID_SUBSETSTR_NEWA) ) );
+ aAllSubsets.emplace_back( 0x11400, 0x1147F, SvxResId(RID_SUBSETSTR_NEWA) );
break;
case UBLOCK_OSAGE:
- aAllSubsets.push_back( Subset( 0x104B0, 0x104FF, SvxResId(RID_SUBSETSTR_OSAGE) ) );
+ aAllSubsets.emplace_back( 0x104B0, 0x104FF, SvxResId(RID_SUBSETSTR_OSAGE) );
break;
case UBLOCK_TANGUT:
- aAllSubsets.push_back( Subset( 0x17000, 0x187FF, SvxResId(RID_SUBSETSTR_TANGUT) ) );
+ aAllSubsets.emplace_back( 0x17000, 0x187FF, SvxResId(RID_SUBSETSTR_TANGUT) );
break;
case UBLOCK_TANGUT_COMPONENTS:
- aAllSubsets.push_back( Subset( 0x18800, 0x18AFF, SvxResId(RID_SUBSETSTR_TANGUT_COMPONENTS) ) );
+ aAllSubsets.emplace_back( 0x18800, 0x18AFF, SvxResId(RID_SUBSETSTR_TANGUT_COMPONENTS) );
break;
#endif
diff --git a/svx/source/dialog/framelink.cxx b/svx/source/dialog/framelink.cxx
index 402a7c42ce27..1b858c0fbf0f 100644
--- a/svx/source/dialog/framelink.cxx
+++ b/svx/source/dialog/framelink.cxx
@@ -331,21 +331,21 @@ void getOffsetPairsFromStyle(const Style& rStyle, std::vector< OffsetPair >& off
case RefMode::Centered:
{
const double fHalfFullWidth(rStyle.GetWidth() * 0.5);
- offsets.push_back(OffsetPair(-fHalfFullWidth, rStyle.Prim() - fHalfFullWidth));
- offsets.push_back(OffsetPair((rStyle.Prim() + rStyle.Dist()) - fHalfFullWidth, fHalfFullWidth));
+ offsets.emplace_back(-fHalfFullWidth, rStyle.Prim() - fHalfFullWidth);
+ offsets.emplace_back((rStyle.Prim() + rStyle.Dist()) - fHalfFullWidth, fHalfFullWidth);
break;
}
case RefMode::Begin:
{
- offsets.push_back(OffsetPair(0.0, rStyle.Prim()));
- offsets.push_back(OffsetPair(rStyle.Prim() + rStyle.Dist(), rStyle.GetWidth()));
+ offsets.emplace_back(0.0, rStyle.Prim());
+ offsets.emplace_back(rStyle.Prim() + rStyle.Dist(), rStyle.GetWidth());
break;
}
default: // case RefMode::End:
{
const double fFullWidth(rStyle.GetWidth());
- offsets.push_back(OffsetPair(-fFullWidth, rStyle.Prim() - fFullWidth));
- offsets.push_back(OffsetPair((rStyle.Prim() + rStyle.Dist()) - fFullWidth, 0.0));
+ offsets.emplace_back(-fFullWidth, rStyle.Prim() - fFullWidth);
+ offsets.emplace_back((rStyle.Prim() + rStyle.Dist()) - fFullWidth, 0.0);
break;
}
}
@@ -356,13 +356,13 @@ void getOffsetPairsFromStyle(const Style& rStyle, std::vector< OffsetPair >& off
switch (rStyle.GetRefMode())
{
case RefMode::Centered:
- offsets.push_back(OffsetPair(rStyle.Prim() * -0.5, rStyle.Prim() * 0.5));
+ offsets.emplace_back(rStyle.Prim() * -0.5, rStyle.Prim() * 0.5);
break;
case RefMode::Begin:
- offsets.push_back(OffsetPair(0.0, rStyle.Prim()));
+ offsets.emplace_back(0.0, rStyle.Prim());
break;
default: // case RefMode::End:
- offsets.push_back(OffsetPair(-rStyle.Prim(), 0.0));
+ offsets.emplace_back(-rStyle.Prim(), 0.0);
break;
}
}
diff --git a/svx/source/dialog/frmsel.cxx b/svx/source/dialog/frmsel.cxx
index e3ccf03eebc0..f89b160f949c 100644
--- a/svx/source/dialog/frmsel.cxx
+++ b/svx/source/dialog/frmsel.cxx
@@ -338,7 +338,7 @@ void FrameSelectorImpl::InitArrowImageList()
{
BitmapEx aBmpEx(aImageIds[i]);
aBmpEx.Replace(pColorAry1, pColorAry2, 3);
- maArrows.push_back(Image(aBmpEx));
+ maArrows.emplace_back(aBmpEx);
}
assert(maArrows.size() == 16);
@@ -414,21 +414,21 @@ void FrameSelectorImpl::InitBorderGeometry()
long nDiagFocusOffsY = frame::GetTLDiagOffset( -mnFocusOffs, mnFocusOffs, maArray.GetVerDiagAngle( nCol, nRow ) );
std::vector< Point > aFocusVec;
- aFocusVec.push_back( Point( aRect.Left() - mnFocusOffs, aRect.Top() + nDiagFocusOffsY ) );
- aFocusVec.push_back( Point( aRect.Left() - mnFocusOffs, aRect.Top() - mnFocusOffs ) );
- aFocusVec.push_back( Point( aRect.Left() + nDiagFocusOffsX, aRect.Top() - mnFocusOffs ) );
- aFocusVec.push_back( Point( aRect.Right() + mnFocusOffs, aRect.Bottom() - nDiagFocusOffsY ) );
- aFocusVec.push_back( Point( aRect.Right() + mnFocusOffs, aRect.Bottom() + mnFocusOffs ) );
- aFocusVec.push_back( Point( aRect.Right() - nDiagFocusOffsX, aRect.Bottom() + mnFocusOffs ) );
+ aFocusVec.emplace_back( aRect.Left() - mnFocusOffs, aRect.Top() + nDiagFocusOffsY );
+ aFocusVec.emplace_back( aRect.Left() - mnFocusOffs, aRect.Top() - mnFocusOffs );
+ aFocusVec.emplace_back( aRect.Left() + nDiagFocusOffsX, aRect.Top() - mnFocusOffs );
+ aFocusVec.emplace_back( aRect.Right() + mnFocusOffs, aRect.Bottom() - nDiagFocusOffsY );
+ aFocusVec.emplace_back( aRect.Right() + mnFocusOffs, aRect.Bottom() + mnFocusOffs );
+ aFocusVec.emplace_back( aRect.Right() - nDiagFocusOffsX, aRect.Bottom() + mnFocusOffs );
maTLBR.AddFocusPolygon( tools::Polygon( static_cast< sal_uInt16 >( aFocusVec.size() ), &aFocusVec[ 0 ] ) );
aFocusVec.clear();
- aFocusVec.push_back( Point( aRect.Right() + mnFocusOffs, aRect.Top() + nDiagFocusOffsY ) );
- aFocusVec.push_back( Point( aRect.Right() + mnFocusOffs, aRect.Top() - mnFocusOffs ) );
- aFocusVec.push_back( Point( aRect.Right() - nDiagFocusOffsX, aRect.Top() - mnFocusOffs ) );
- aFocusVec.push_back( Point( aRect.Left() - mnFocusOffs, aRect.Bottom() - nDiagFocusOffsY ) );
- aFocusVec.push_back( Point( aRect.Left() - mnFocusOffs, aRect.Bottom() + mnFocusOffs ) );
- aFocusVec.push_back( Point( aRect.Left() + nDiagFocusOffsX, aRect.Bottom() + mnFocusOffs ) );
+ aFocusVec.emplace_back( aRect.Right() + mnFocusOffs, aRect.Top() + nDiagFocusOffsY );
+ aFocusVec.emplace_back( aRect.Right() + mnFocusOffs, aRect.Top() - mnFocusOffs );
+ aFocusVec.emplace_back( aRect.Right() - nDiagFocusOffsX, aRect.Top() - mnFocusOffs );
+ aFocusVec.emplace_back( aRect.Left() - mnFocusOffs, aRect.Bottom() - nDiagFocusOffsY );
+ aFocusVec.emplace_back( aRect.Left() - mnFocusOffs, aRect.Bottom() + mnFocusOffs );
+ aFocusVec.emplace_back( aRect.Left() + nDiagFocusOffsX, aRect.Bottom() + mnFocusOffs );
maBLTR.AddFocusPolygon( tools::Polygon( static_cast< sal_uInt16 >( aFocusVec.size() ), &aFocusVec[ 0 ] ) );
}
}
diff --git a/svx/source/dialog/orienthelper.cxx b/svx/source/dialog/orienthelper.cxx
index e969cc272fa9..01180a7494e1 100644
--- a/svx/source/dialog/orienthelper.cxx
+++ b/svx/source/dialog/orienthelper.cxx
@@ -58,14 +58,14 @@ OrientationHelper_Impl::OrientationHelper_Impl( DialControl& rCtrlDial, CheckBox
mbEnabled( rCtrlDial.IsEnabled() ),
mbVisible( rCtrlDial.IsVisible() )
{
- maWinVec.push_back( WindowPair( &mrCtrlDial, TRISTATE_TRUE ) );
- maWinVec.push_back( WindowPair( &mrCbStacked, TRISTATE_INDET ) );
+ maWinVec.emplace_back( &mrCtrlDial, TRISTATE_TRUE );
+ maWinVec.emplace_back( &mrCbStacked, TRISTATE_INDET );
mrCbStacked.SetClickHdl( LINK( this, OrientationHelper_Impl, ClickHdl ) );
}
void OrientationHelper_Impl::AddDependentWindow( vcl::Window& rWindow, TriState eDisableIfStacked )
{
- maWinVec.push_back( std::make_pair( &rWindow, eDisableIfStacked ) );
+ maWinVec.emplace_back( &rWindow, eDisableIfStacked );
EnableWindow( rWindow, eDisableIfStacked );
}
diff --git a/svx/source/engine3d/helperhittest3d.cxx b/svx/source/engine3d/helperhittest3d.cxx
index eb0226981d07..09dbdf45cd8d 100644
--- a/svx/source/engine3d/helperhittest3d.cxx
+++ b/svx/source/engine3d/helperhittest3d.cxx
@@ -203,7 +203,7 @@ void getAllHit3DObjectsSortedFrontToBack(
for(basegfx::B3DPoint & a : aHitsWithObject)
{
const basegfx::B3DPoint aPointInViewCoordinates(aViewInfo3D.getObjectToView() * a);
- aDepthAndObjectResults.push_back(ImplPairDephAndObject(pCandidate, aPointInViewCoordinates.getZ()));
+ aDepthAndObjectResults.emplace_back(pCandidate, aPointInViewCoordinates.getZ());
}
}
}
diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx
index 5078e793481f..552e116fa655 100644
--- a/svx/source/fmcomp/fmgridcl.cxx
+++ b/svx/source/fmcomp/fmgridcl.cxx
@@ -419,56 +419,56 @@ IMPL_LINK_NOARG( FmGridHeader, OnAsyncExecuteDrop, void*, void )
{
case DataType::BIT:
case DataType::BOOLEAN:
- aPossibleTypes.push_back(FM_COL_CHECKBOX);
- aImgResId.push_back(RID_SVXBMP_CHECKBOX);
+ aPossibleTypes.emplace_back(FM_COL_CHECKBOX);
+ aImgResId.emplace_back(RID_SVXBMP_CHECKBOX);
break;
case DataType::TINYINT:
case DataType::SMALLINT:
case DataType::INTEGER:
- aPossibleTypes.push_back(FM_COL_NUMERICFIELD);
- aImgResId.push_back(RID_SVXBMP_NUMERICFIELD);
- aPossibleTypes.push_back(FM_COL_FORMATTEDFIELD);
- aImgResId.push_back(RID_SVXBMP_FORMATTEDFIELD);
+ aPossibleTypes.emplace_back(FM_COL_NUMERICFIELD);
+ aImgResId.emplace_back(RID_SVXBMP_NUMERICFIELD);
+ aPossibleTypes.emplace_back(FM_COL_FORMATTEDFIELD);
+ aImgResId.emplace_back(RID_SVXBMP_FORMATTEDFIELD);
break;
case DataType::REAL:
case DataType::DOUBLE:
case DataType::NUMERIC:
case DataType::DECIMAL:
- aPossibleTypes.push_back(FM_COL_FORMATTEDFIELD);
- aImgResId.push_back(RID_SVXBMP_FORMATTEDFIELD);
- aPossibleTypes.push_back(FM_COL_NUMERICFIELD);
- aImgResId.push_back(RID_SVXBMP_NUMERICFIELD);
+ aPossibleTypes.emplace_back(FM_COL_FORMATTEDFIELD);
+ aImgResId.emplace_back(RID_SVXBMP_FORMATTEDFIELD);
+ aPossibleTypes.emplace_back(FM_COL_NUMERICFIELD);
+ aImgResId.emplace_back(RID_SVXBMP_NUMERICFIELD);
break;
case DataType::TIMESTAMP:
- aPossibleTypes.push_back("dateandtimefield");
- aImgResId.push_back(RID_SVXBMP_DATE_N_TIME_FIELDS);
- aPossibleTypes.push_back(FM_COL_DATEFIELD);
- aImgResId.push_back(RID_SVXBMP_DATEFIELD);
- aPossibleTypes.push_back(FM_COL_TIMEFIELD);
- aImgResId.push_back(RID_SVXBMP_TIMEFIELD);
- aPossibleTypes.push_back(FM_COL_FORMATTEDFIELD);
- aImgResId.push_back(RID_SVXBMP_FORMATTEDFIELD);
+ aPossibleTypes.emplace_back("dateandtimefield");
+ aImgResId.emplace_back(RID_SVXBMP_DATE_N_TIME_FIELDS);
+ aPossibleTypes.emplace_back(FM_COL_DATEFIELD);
+ aImgResId.emplace_back(RID_SVXBMP_DATEFIELD);
+ aPossibleTypes.emplace_back(FM_COL_TIMEFIELD);
+ aImgResId.emplace_back(RID_SVXBMP_TIMEFIELD);
+ aPossibleTypes.emplace_back(FM_COL_FORMATTEDFIELD);
+ aImgResId.emplace_back(RID_SVXBMP_FORMATTEDFIELD);
break;
case DataType::DATE:
- aPossibleTypes.push_back(FM_COL_DATEFIELD);
- aImgResId.push_back(RID_SVXBMP_DATEFIELD);
- aPossibleTypes.push_back(FM_COL_FORMATTEDFIELD);
- aImgResId.push_back(RID_SVXBMP_FORMATTEDFIELD);
+ aPossibleTypes.emplace_back(FM_COL_DATEFIELD);
+ aImgResId.emplace_back(RID_SVXBMP_DATEFIELD);
+ aPossibleTypes.emplace_back(FM_COL_FORMATTEDFIELD);
+ aImgResId.emplace_back(RID_SVXBMP_FORMATTEDFIELD);
break;
case DataType::TIME:
- aPossibleTypes.push_back(FM_COL_TIMEFIELD);
- aImgResId.push_back(RID_SVXBMP_TIMEFIELD);
- aPossibleTypes.push_back(FM_COL_FORMATTEDFIELD);
- aImgResId.push_back(RID_SVXBMP_FORMATTEDFIELD);
+ aPossibleTypes.emplace_back(FM_COL_TIMEFIELD);
+ aImgResId.emplace_back(RID_SVXBMP_TIMEFIELD);
+ aPossibleTypes.emplace_back(FM_COL_FORMATTEDFIELD);
+ aImgResId.emplace_back(RID_SVXBMP_FORMATTEDFIELD);
break;
case DataType::CHAR:
case DataType::VARCHAR:
case DataType::LONGVARCHAR:
default:
- aPossibleTypes.push_back(FM_COL_TEXTFIELD);
- aImgResId.push_back(RID_SVXBMP_EDITBOX);
- aPossibleTypes.push_back(FM_COL_FORMATTEDFIELD);
- aImgResId.push_back(RID_SVXBMP_FORMATTEDFIELD);
+ aPossibleTypes.emplace_back(FM_COL_TEXTFIELD);
+ aImgResId.emplace_back(RID_SVXBMP_EDITBOX);
+ aPossibleTypes.emplace_back(FM_COL_FORMATTEDFIELD);
+ aImgResId.emplace_back(RID_SVXBMP_FORMATTEDFIELD);
break;
}
// if it's a currency field, a "currency field" option
diff --git a/svx/source/form/fmobjfac.cxx b/svx/source/form/fmobjfac.cxx
index d1127ac7afa9..2ec2a56d8bf6 100644
--- a/svx/source/form/fmobjfac.cxx
+++ b/svx/source/form/fmobjfac.cxx
@@ -169,7 +169,7 @@ IMPL_STATIC_LINK(
case OBJ_FM_TIMEFIELD:
sServiceSpecifier = FM_COMPONENT_TIMEFIELD;
- aInitialProperties.push_back( PropertyValueArray::value_type( FM_PROP_TIMEMAX, makeAny( tools::Time( 23, 59, 59, 999999999 ).GetUNOTime() ) ) );
+ aInitialProperties.emplace_back( FM_PROP_TIMEMAX, makeAny( tools::Time( 23, 59, 59, 999999999 ).GetUNOTime() ) );
break;
case OBJ_FM_NUMERICFIELD:
@@ -202,12 +202,12 @@ IMPL_STATIC_LINK(
case OBJ_FM_SCROLLBAR:
sServiceSpecifier = FM_SUN_COMPONENT_SCROLLBAR;
- aInitialProperties.push_back( PropertyValueArray::value_type( FM_PROP_BORDER, makeAny( (sal_Int16)0 ) ) );
+ aInitialProperties.emplace_back( FM_PROP_BORDER, makeAny( (sal_Int16)0 ) );
break;
case OBJ_FM_SPINBUTTON:
sServiceSpecifier = FM_SUN_COMPONENT_SPINBUTTON;
- aInitialProperties.push_back( PropertyValueArray::value_type( FM_PROP_BORDER, makeAny( (sal_Int16)0 ) ) );
+ aInitialProperties.emplace_back( FM_PROP_BORDER, makeAny( (sal_Int16)0 ) );
break;
}
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index 57e700035123..2eb69a433a93 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -968,7 +968,7 @@ void FmXFormShell::InvalidateSlot_Lock(sal_Int16 nId, bool bWithId)
if (m_nLockSlotInvalidation)
{
sal_uInt8 nFlags = ( bWithId ? 0x01 : 0 );
- m_arrInvalidSlots.push_back( InvalidSlotInfo(nId, nFlags) );
+ m_arrInvalidSlots.emplace_back(nId, nFlags );
}
else
if (nId)
@@ -2463,7 +2463,7 @@ IMPL_LINK(FmXFormShell, OnSearchContextRequest_Lock, FmSearchContext&, rfmscCont
m_arrRelativeGridColumn.push_back(-1);
// and for the formatted search...
- rfmscContextInfo.arrFields.push_back(Reference<XInterface>( xControl, UNO_QUERY ));
+ rfmscContextInfo.arrFields.emplace_back( xControl, UNO_QUERY );
}
}
}
@@ -3057,7 +3057,7 @@ void FmXFormShell::stopFiltering_Lock(bool bSave)
if (aOriginalFilters.size() == aOriginalApplyFlags.size())
// the first getPropertyValue failed -> use two dummies
- aOriginalFilters.push_back( OUString() );
+ aOriginalFilters.emplace_back( );
aOriginalApplyFlags.push_back( false );
}
}
diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx
index f54e6771cb16..d8583aa16a53 100644
--- a/svx/source/form/formcontroller.cxx
+++ b/svx/source/form/formcontroller.cxx
@@ -3276,7 +3276,7 @@ void FormController::startFiltering()
if (xText.is() && xField.is() && ::comphelper::hasProperty(FM_PROP_SEARCHABLE, xField) &&
::comphelper::getBOOL(xField->getPropertyValue(FM_PROP_SEARCHABLE)))
{
- aFieldInfos.push_back(FmFieldInfo(xField, xText));
+ aFieldInfos.emplace_back(xField, xText);
xText->addTextListener(this);
}
}
@@ -3311,7 +3311,7 @@ void FormController::startFiltering()
if ( replaceControl( xControl, xFilterControl ) )
{
Reference< XTextComponent > xFilterText( xFilterControl, UNO_QUERY );
- aFieldInfos.push_back( FmFieldInfo( xField, xFilterText ) );
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list