[Libreoffice-commits] core.git: 7 commits - cui/source include/sfx2 postprocess/CustomTarget_images.mk sc/source sfx2/source starmath/inc starmath/source sw/source vcl/AllLangResTarget_vcl.mk vcl/source
Caolán McNamara
caolanm at redhat.com
Thu Oct 13 09:39:16 UTC 2016
cui/source/inc/cuires.hrc | 1
cui/source/inc/treeopt.hxx | 2
cui/source/options/treeopt.cxx | 2
cui/source/options/treeopt.src | 255 ++++++++++++++---------------
include/sfx2/sfxsids.hrc | 2
postprocess/CustomTarget_images.mk | 1
sc/source/ui/src/scwarngs.src | 37 ----
sfx2/source/appl/app.src | 5
starmath/inc/smmod.hxx | 2
starmath/inc/starmath.hrc | 1
starmath/source/smmod.cxx | 11 -
starmath/source/symbol.src | 169 +++++++++----------
sw/source/ui/index/cnttab.src | 36 +---
sw/source/ui/misc/numberingtypelistbox.src | 58 +++---
sw/source/uibase/inc/cnttab.hxx | 13 -
sw/source/uibase/utlui/unotools.cxx | 6
sw/source/uibase/utlui/unotools.src | 11 -
vcl/AllLangResTarget_vcl.mk | 1
vcl/source/control/throbber.ilst | 30 +++
vcl/source/src/throbber.src | 67 -------
20 files changed, 299 insertions(+), 411 deletions(-)
New commits:
commit a8fa87913f61ffbb67e224366d865ffe6ccfff86
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Oct 13 10:21:08 2016 +0100
move pseudo bitmap resources to an ilst
Change-Id: Ib649db6620c83a42e96ca45e4a5018fdff74286b
diff --git a/postprocess/CustomTarget_images.mk b/postprocess/CustomTarget_images.mk
index 818c86f..ecfbe96 100644
--- a/postprocess/CustomTarget_images.mk
+++ b/postprocess/CustomTarget_images.mk
@@ -28,6 +28,7 @@ $(packimages_DIR)/%.zip : \
$(packimages_DIR)/sorted.lst \
$(packimages_DIR)/commandimagelist.ilst \
$(SRCDIR)/sfx2/source/sidebar/sidebar.ilst \
+ $(SRCDIR)/vcl/source/control/throbber.ilst \
$(call gb_Helper_optional,HELP,$(helpimages_DIR)/helpimg.ilst) \
$(call gb_Helper_optional,DBCONNECTIVITY,$(if $(ENABLE_JAVA),$(SRCDIR)/connectivity/source/drivers/hsqldb/hsqlui.ilst)) \
$(call gb_Helper_get_imagelists)
diff --git a/vcl/AllLangResTarget_vcl.mk b/vcl/AllLangResTarget_vcl.mk
index 822b3a2..c76fcd0 100644
--- a/vcl/AllLangResTarget_vcl.mk
+++ b/vcl/AllLangResTarget_vcl.mk
@@ -46,7 +46,6 @@ $(eval $(call gb_SrsTarget_add_files,vcl/source/src,\
$(eval $(call gb_SrsTarget_add_nonlocalizable_files,vcl/source/src,\
vcl/source/src/images.src \
- vcl/source/src/throbber.src \
))
# vim: set noet sw=4 ts=4:
diff --git a/vcl/source/control/throbber.ilst b/vcl/source/control/throbber.ilst
new file mode 100644
index 0000000..17f9e3e
--- /dev/null
+++ b/vcl/source/control/throbber.ilst
@@ -0,0 +1,30 @@
+%MODULE%/vcl/res/spinner-16-01.png
+%MODULE%/vcl/res/spinner-16-02.png
+%MODULE%/vcl/res/spinner-16-03.png
+%MODULE%/vcl/res/spinner-16-04.png
+%MODULE%/vcl/res/spinner-16-05.png
+%MODULE%/vcl/res/spinner-16-06.png
+%MODULE%/vcl/res/spinner-32-01.png
+%MODULE%/vcl/res/spinner-32-02.png
+%MODULE%/vcl/res/spinner-32-03.png
+%MODULE%/vcl/res/spinner-32-04.png
+%MODULE%/vcl/res/spinner-32-05.png
+%MODULE%/vcl/res/spinner-32-06.png
+%MODULE%/vcl/res/spinner-32-07.png
+%MODULE%/vcl/res/spinner-32-08.png
+%MODULE%/vcl/res/spinner-32-09.png
+%MODULE%/vcl/res/spinner-32-10.png
+%MODULE%/vcl/res/spinner-32-11.png
+%MODULE%/vcl/res/spinner-32-12.png
+%MODULE%/vcl/res/spinner-64-01.png
+%MODULE%/vcl/res/spinner-64-02.png
+%MODULE%/vcl/res/spinner-64-03.png
+%MODULE%/vcl/res/spinner-64-04.png
+%MODULE%/vcl/res/spinner-64-05.png
+%MODULE%/vcl/res/spinner-64-06.png
+%MODULE%/vcl/res/spinner-64-07.png
+%MODULE%/vcl/res/spinner-64-08.png
+%MODULE%/vcl/res/spinner-64-09.png
+%MODULE%/vcl/res/spinner-64-10.png
+%MODULE%/vcl/res/spinner-64-11.png
+%MODULE%/vcl/res/spinner-64-12.png
diff --git a/vcl/source/src/throbber.src b/vcl/source/src/throbber.src
deleted file mode 100644
index 41a5f50..0000000
--- a/vcl/source/src/throbber.src
+++ /dev/null
@@ -1,67 +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 .
- */
-
-// TODO: we need a mechanism to add images to images.zip, *without*
-// referring them in resource files. The below resources are never loaded
-// at runtime, instead, the images in images.zip are accessed via
-// private:graphicrepository/* URLs.
-
-Resource 3000
-{
- Image 1 { ImageBitmap = Bitmap{ file = "spinner-16-01.png"; }; };
- Image 2 { ImageBitmap = Bitmap{ file = "spinner-16-02.png"; }; };
- Image 3 { ImageBitmap = Bitmap{ file = "spinner-16-03.png"; }; };
- Image 4 { ImageBitmap = Bitmap{ file = "spinner-16-04.png"; }; };
- Image 5 { ImageBitmap = Bitmap{ file = "spinner-16-05.png"; }; };
- Image 6 { ImageBitmap = Bitmap{ file = "spinner-16-06.png"; }; };
-};
-
-Resource 3001
-{
- Image 1 { ImageBitmap = Bitmap{ file = "spinner-32-01.png"; }; };
- Image 2 { ImageBitmap = Bitmap{ file = "spinner-32-02.png"; }; };
- Image 3 { ImageBitmap = Bitmap{ file = "spinner-32-03.png"; }; };
- Image 4 { ImageBitmap = Bitmap{ file = "spinner-32-04.png"; }; };
- Image 5 { ImageBitmap = Bitmap{ file = "spinner-32-05.png"; }; };
- Image 6 { ImageBitmap = Bitmap{ file = "spinner-32-06.png"; }; };
- Image 7 { ImageBitmap = Bitmap{ file = "spinner-32-07.png"; }; };
- Image 8 { ImageBitmap = Bitmap{ file = "spinner-32-08.png"; }; };
- Image 9 { ImageBitmap = Bitmap{ file = "spinner-32-09.png"; }; };
- Image 10 { ImageBitmap = Bitmap{ file = "spinner-32-10.png"; }; };
- Image 11 { ImageBitmap = Bitmap{ file = "spinner-32-11.png"; }; };
- Image 12 { ImageBitmap = Bitmap{ file = "spinner-32-12.png"; }; };
-};
-
-Resource 3002
-{
- Image 1 { ImageBitmap = Bitmap{ file = "spinner-64-01.png"; }; };
- Image 2 { ImageBitmap = Bitmap{ file = "spinner-64-02.png"; }; };
- Image 3 { ImageBitmap = Bitmap{ file = "spinner-64-03.png"; }; };
- Image 4 { ImageBitmap = Bitmap{ file = "spinner-64-04.png"; }; };
- Image 5 { ImageBitmap = Bitmap{ file = "spinner-64-05.png"; }; };
- Image 6 { ImageBitmap = Bitmap{ file = "spinner-64-06.png"; }; };
- Image 7 { ImageBitmap = Bitmap{ file = "spinner-64-07.png"; }; };
- Image 8 { ImageBitmap = Bitmap{ file = "spinner-64-08.png"; }; };
- Image 9 { ImageBitmap = Bitmap{ file = "spinner-64-09.png"; }; };
- Image 10 { ImageBitmap = Bitmap{ file = "spinner-64-10.png"; }; };
- Image 11 { ImageBitmap = Bitmap{ file = "spinner-64-11.png"; }; };
- Image 12 { ImageBitmap = Bitmap{ file = "spinner-64-12.png"; }; };
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit f1bb456e60f208ff5c422f025fe2e4f3404d8bb4
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Oct 13 10:12:06 2016 +0100
no need to inherit MenuResource from Resource
Change-Id: I17a6e456de50841173e356c620b4c9f67b945574
diff --git a/sw/source/uibase/utlui/unotools.cxx b/sw/source/uibase/utlui/unotools.cxx
index a23774c..4a89a65 100644
--- a/sw/source/uibase/utlui/unotools.cxx
+++ b/sw/source/uibase/utlui/unotools.cxx
@@ -550,11 +550,9 @@ void SwFrameCtrlWindow::Resize()
pExampleFrame->ClearDocument();
}
-MenuResource::MenuResource(const ResId& rResId) :
- Resource(rResId),
- aMenuArray(ResId(1,*rResId.GetResMgr()))
+MenuResource::MenuResource(const ResId& rResId)
+ : aMenuArray(rResId)
{
- FreeResource();
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/utlui/unotools.src b/sw/source/uibase/utlui/unotools.src
index 0bd6b21..0ae74dd 100644
--- a/sw/source/uibase/utlui/unotools.src
+++ b/sw/source/uibase/utlui/unotools.src
@@ -26,16 +26,13 @@ String STR_SERVICE_UNAVAILABLE
Text [ en-US ] = "The following service is not available: ";
};
-Resource RES_FRMEX_MENU
+StringArray RES_FRMEX_MENU
{
- StringArray 1
- {
ItemList [ en-US ] =
{
- < "~Zoom" ; ST_MENU_ZOOM; > ;
- < "~Upwards" ; ST_MENU_UP; > ;
- < "Do~wnwards" ; ST_MENU_DOWN; > ;
- };
+ < "~Zoom" ; ST_MENU_ZOOM; > ;
+ < "~Upwards" ; ST_MENU_UP; > ;
+ < "Do~wnwards" ; ST_MENU_DOWN; > ;
};
};
commit 15cea705426e9c58b034a8d9ac8d1e3802b4cc74
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Oct 13 10:08:01 2016 +0100
no need to inherit SwOLENames from resource
Change-Id: Ie7a51c8af7834b4d59a5a94e808ccac7e63e3aa4
diff --git a/sw/source/ui/index/cnttab.src b/sw/source/ui/index/cnttab.src
index e7f43ca..7205296 100644
--- a/sw/source/ui/index/cnttab.src
+++ b/sw/source/ui/index/cnttab.src
@@ -132,31 +132,29 @@ String STR_TOKEN_HELP_AUTHORITY
{
Text [ en-US ] = "Bibliography entry: ";
};
+
String STR_CHARSTYLE
{
Text [ en-US ] = "Character Style: ";
};
-Resource RES_SRCTYPES
-{
- StringArray 1
+StringArray RES_SRCTYPES
+{
+ /* ids from tox.hxx
+ TOO_MATH = 0x01,
+ TOO_CHART = 0x02,
+ TOO_IMAGE = 0x04,
+ TOO_CALC = 0x08,
+ TOO_DRAW_IMPRESS= 0x10,
+ TOO_OTHER = 0x80
+ */
+ ItemList [ en-US ] =
{
- /* ids from tox.hxx
- TOO_MATH = 0x01,
- TOO_CHART = 0x02,
- TOO_IMAGE = 0x04,
- TOO_CALC = 0x08,
- TOO_DRAW_IMPRESS= 0x10,
- TOO_OTHER = 0x80
- */
- ItemList [ en-US ] =
- {
- < "%PRODUCTNAME Math" ; 1;> ;
- < "%PRODUCTNAME Chart" ; 2;> ;
- < "%PRODUCTNAME Calc" ; 8;> ;
- < "%PRODUCTNAME Draw/%PRODUCTNAME Impress" ; 16;> ;
- < "Other OLE Objects"; 128;> ;
- };
+ < "%PRODUCTNAME Math" ; 1;> ;
+ < "%PRODUCTNAME Chart" ; 2;> ;
+ < "%PRODUCTNAME Calc" ; 8;> ;
+ < "%PRODUCTNAME Draw/%PRODUCTNAME Impress" ; 16;> ;
+ < "Other OLE Objects"; 128;> ;
};
};
diff --git a/sw/source/ui/misc/numberingtypelistbox.src b/sw/source/ui/misc/numberingtypelistbox.src
index f7b23cc..cbd9873 100644
--- a/sw/source/ui/misc/numberingtypelistbox.src
+++ b/sw/source/ui/misc/numberingtypelistbox.src
@@ -19,39 +19,35 @@
#include "misc.hrc"
-Resource STRRES_NUMTYPES
+StringArray STRRES_NUMTYPES
{
- StringArray 1
+ ItemList [ en-US ] =
{
-
- ItemList [ en-US ] =
- {
- < "None" ; 5/*SVX_NUM_NUMBER_NONE */; > ;
- < "Bullet" ; 6/*SVX_NUM_CHAR_SPECIAL */; > ;
- < "Graphics" ; 8/*SVX_NUM_BITMAP */; > ;
- < "1, 2, 3, ..." ; 4/*SVX_NUM_ARABIC */; > ;
- < "A, B, C, ..." ; 0/*SVX_NUM_CHARS_UPPER_LETTER */; > ;
- < "a, b, c, ..." ; 1/*SVX_NUM_CHARS_LOWER_LETTER */; > ;
- < "I, II, III, ..." ; 2/*SVX_NUM_ROMAN_UPPER */; > ;
- < "i, ii, iii, ..." ; 3/*SVX_NUM_ROMAN_LOWER */; > ;
- < "A, .., AA, .., AAA, ..." ; 9/*SVX_NUM_CHARS_UPPER_LETTER_N*/; > ;
- < "a, .., aa, .., aaa, ..." ; 10/*SVX_NUM_CHARS_LOWER_LETTER_N*/; > ;
- < "Native Numbering" ; 12 /*NATIVE_NUMBERING */; > ;
- < "А, Б, .., Аа, Аб, ... (Bulgarian)" ; 38 /*CHARS_CYRILLIC_UPPER_LETTER_BG */; > ;
- < "а, б, .., аа, аб, ... (Bulgarian)" ; 39 /*CHARS_CYRILLIC_LOWER_LETTER_BG */; > ;
- < "А, Б, .., Аа, Бб, ... (Bulgarian)" ; 40 /*CHARS_CYRILLIC_UPPER_LETTER_N_BG */; > ;
- < "а, б, .., аа, бб, ... (Bulgarian)" ; 41 /*CHARS_CYRILLIC_LOWER_LETTER_N_BG */; > ;
- < "А, Б, .., Аа, Аб, ... (Russian)" ; 42 /*CHARS_CYRILLIC_UPPER_LETTER_RU */; > ;
- < "а, б, .., аа, аб, ... (Russian)" ; 43 /*CHARS_CYRILLIC_LOWER_LETTER_RU */; > ;
- < "А, Б, .., Аа, Бб, ... (Russian)" ; 44 /*CHARS_CYRILLIC_UPPER_LETTER_N_RU */; > ;
- < "а, б, .., аа, бб, ... (Russian)" ; 45 /*CHARS_CYRILLIC_LOWER_LETTER_N_RU */; > ;
- < "А, Б, .., Аа, Аб, ... (Serbian)" ; 48 /*CHARS_CYRILLIC_UPPER_LETTER_SR */; > ;
- < "а, б, .., аа, аб, ... (Serbian)" ; 49 /*CHARS_CYRILLIC_LOWER_LETTER_SR */; > ;
- < "А, Б, .., Аа, Бб, ... (Serbian)" ; 50 /*CHARS_CYRILLIC_UPPER_LETTER_N_SR */; > ;
- < "а, б, .., аа, бб, ... (Serbian)" ; 51 /*CHARS_CYRILLIC_LOWER_LETTER_N_SR */; > ;
- < "Α, Β, Γ, ... (Greek Upper Letter)"; 52 /*CHARS_GREEK_UPPER_LETTER */; > ;
- < "α, β, γ, ... (Greek Lower Letter)"; 53 /*CHARS_GREEK_LOWER_LETTER */; > ;
- };
+ < "None" ; 5/*SVX_NUM_NUMBER_NONE */; > ;
+ < "Bullet" ; 6/*SVX_NUM_CHAR_SPECIAL */; > ;
+ < "Graphics" ; 8/*SVX_NUM_BITMAP */; > ;
+ < "1, 2, 3, ..." ; 4/*SVX_NUM_ARABIC */; > ;
+ < "A, B, C, ..." ; 0/*SVX_NUM_CHARS_UPPER_LETTER */; > ;
+ < "a, b, c, ..." ; 1/*SVX_NUM_CHARS_LOWER_LETTER */; > ;
+ < "I, II, III, ..." ; 2/*SVX_NUM_ROMAN_UPPER */; > ;
+ < "i, ii, iii, ..." ; 3/*SVX_NUM_ROMAN_LOWER */; > ;
+ < "A, .., AA, .., AAA, ..." ; 9/*SVX_NUM_CHARS_UPPER_LETTER_N*/; > ;
+ < "a, .., aa, .., aaa, ..." ; 10/*SVX_NUM_CHARS_LOWER_LETTER_N*/; > ;
+ < "Native Numbering" ; 12 /*NATIVE_NUMBERING */; > ;
+ < "А, Б, .., Аа, Аб, ... (Bulgarian)" ; 38 /*CHARS_CYRILLIC_UPPER_LETTER_BG */; > ;
+ < "а, б, .., аа, аб, ... (Bulgarian)" ; 39 /*CHARS_CYRILLIC_LOWER_LETTER_BG */; > ;
+ < "А, Б, .., Аа, Бб, ... (Bulgarian)" ; 40 /*CHARS_CYRILLIC_UPPER_LETTER_N_BG */; > ;
+ < "а, б, .., аа, бб, ... (Bulgarian)" ; 41 /*CHARS_CYRILLIC_LOWER_LETTER_N_BG */; > ;
+ < "А, Б, .., Аа, Аб, ... (Russian)" ; 42 /*CHARS_CYRILLIC_UPPER_LETTER_RU */; > ;
+ < "а, б, .., аа, аб, ... (Russian)" ; 43 /*CHARS_CYRILLIC_LOWER_LETTER_RU */; > ;
+ < "А, Б, .., Аа, Бб, ... (Russian)" ; 44 /*CHARS_CYRILLIC_UPPER_LETTER_N_RU */; > ;
+ < "а, б, .., аа, бб, ... (Russian)" ; 45 /*CHARS_CYRILLIC_LOWER_LETTER_N_RU */; > ;
+ < "А, Б, .., Аа, Аб, ... (Serbian)" ; 48 /*CHARS_CYRILLIC_UPPER_LETTER_SR */; > ;
+ < "а, б, .., аа, аб, ... (Serbian)" ; 49 /*CHARS_CYRILLIC_LOWER_LETTER_SR */; > ;
+ < "А, Б, .., Аа, Бб, ... (Serbian)" ; 50 /*CHARS_CYRILLIC_UPPER_LETTER_N_SR */; > ;
+ < "а, б, .., аа, бб, ... (Serbian)" ; 51 /*CHARS_CYRILLIC_LOWER_LETTER_N_SR */; > ;
+ < "Α, Β, Γ, ... (Greek Upper Letter)"; 52 /*CHARS_GREEK_UPPER_LETTER */; > ;
+ < "α, β, γ, ... (Greek Lower Letter)"; 53 /*CHARS_GREEK_LOWER_LETTER */; > ;
};
};
diff --git a/sw/source/uibase/inc/cnttab.hxx b/sw/source/uibase/inc/cnttab.hxx
index e81d0f2..d9c63a7 100644
--- a/sw/source/uibase/inc/cnttab.hxx
+++ b/sw/source/uibase/inc/cnttab.hxx
@@ -64,19 +64,16 @@ struct CurTOXType
CurTOXType (TOXTypes t) : eType (t), nIndex (0) {};
};
-class SwOLENames : public Resource
+class SwOLENames
{
- ResStringArray aNamesAry;
+ ResStringArray aNamesAry;
public:
- SwOLENames(const ResId& rResId) :
- Resource(rResId),
- aNamesAry(ResId(1,*rResId.GetResMgr()))
+ SwOLENames(const ResId& rResId)
+ : aNamesAry(rResId)
{
- FreeResource();
}
- ResStringArray& GetNames() { return aNamesAry;}
-
+ ResStringArray& GetNames() { return aNamesAry;}
};
#endif
commit 32675bd4f19c8a62f83f32ec3e5867f4d20755bc
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Oct 13 10:01:55 2016 +0100
flatten RID_LOCALIZED_NAMES by a level
Change-Id: I5e6fe76d01b82ff6d9f7fde06f4349d54493bf1b
diff --git a/starmath/inc/smmod.hxx b/starmath/inc/smmod.hxx
index 62f244b..f88b5f1 100644
--- a/starmath/inc/smmod.hxx
+++ b/starmath/inc/smmod.hxx
@@ -60,7 +60,7 @@ public:
#define SM_RESSTR(x) SmResId(x).toString()
-class SmLocalizedSymbolData : public Resource
+class SmLocalizedSymbolData
{
ResStringArray aUiSymbolNamesAry;
ResStringArray aExportSymbolNamesAry;
diff --git a/starmath/inc/starmath.hrc b/starmath/inc/starmath.hrc
index ef15e8c..6fc8fb16f 100644
--- a/starmath/inc/starmath.hrc
+++ b/starmath/inc/starmath.hrc
@@ -469,7 +469,6 @@
#define RID_MISC_MENU (RID_APP_START + 2172)
#define RID_FUNCTIONSOTHER1_MENU (RID_APP_START + 2173)
-#define RID_LOCALIZED_NAMES (RID_APP_START + 3101)
#define RID_UI_SYMBOL_NAMES (RID_APP_START + 3102)
#define RID_EXPORT_SYMBOL_NAMES (RID_APP_START + 3103)
#define RID_UI_SYMBOLSET_NAMES (RID_APP_START + 3105)
diff --git a/starmath/source/smmod.cxx b/starmath/source/smmod.cxx
index 014620a..1492880 100644
--- a/starmath/source/smmod.cxx
+++ b/starmath/source/smmod.cxx
@@ -37,29 +37,23 @@
#define SmModule
#include "smslots.hxx"
-
SmResId::SmResId( sal_uInt16 nId )
: ResId(nId, *SM_MOD()->GetResMgr())
{
}
-
SmLocalizedSymbolData::SmLocalizedSymbolData() :
- Resource( SmResId(RID_LOCALIZED_NAMES) ),
aUiSymbolNamesAry ( SmResId(RID_UI_SYMBOL_NAMES) ),
aExportSymbolNamesAry ( SmResId(RID_EXPORT_SYMBOL_NAMES) ),
aUiSymbolSetNamesAry ( SmResId(RID_UI_SYMBOLSET_NAMES) ),
aExportSymbolSetNamesAry( SmResId(RID_EXPORT_SYMBOLSET_NAMES) )
{
- FreeResource();
}
-
SmLocalizedSymbolData::~SmLocalizedSymbolData()
{
}
-
const OUString SmLocalizedSymbolData::GetUiSymbolName( const OUString &rExportName )
{
OUString aRes;
@@ -80,7 +74,6 @@ const OUString SmLocalizedSymbolData::GetUiSymbolName( const OUString &rExportNa
return aRes;
}
-
const OUString SmLocalizedSymbolData::GetExportSymbolName( const OUString &rUiName )
{
OUString aRes;
@@ -101,7 +94,6 @@ const OUString SmLocalizedSymbolData::GetExportSymbolName( const OUString &rUiNa
return aRes;
}
-
const OUString SmLocalizedSymbolData::GetUiSymbolSetName( const OUString &rExportName )
{
OUString aRes;
@@ -122,7 +114,6 @@ const OUString SmLocalizedSymbolData::GetUiSymbolSetName( const OUString &rExpor
return aRes;
}
-
const OUString SmLocalizedSymbolData::GetExportSymbolSetName( const OUString &rUiName )
{
OUString aRes;
@@ -269,6 +260,7 @@ SfxItemSet* SmModule::CreateItemSet( sal_uInt16 nId )
}
return pRet;
}
+
void SmModule::ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet )
{
if(nId == SID_SM_EDITOPTIONS)
@@ -276,6 +268,7 @@ void SmModule::ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet )
GetConfig()->ItemSetToConfig(rSet);
}
}
+
VclPtr<SfxTabPage> SmModule::CreateTabPage( sal_uInt16 nId, vcl::Window* pParent, const SfxItemSet& rSet )
{
VclPtr<SfxTabPage> pRet;
diff --git a/starmath/source/symbol.src b/starmath/source/symbol.src
index dfcc6e8..6f41a45 100644
--- a/starmath/source/symbol.src
+++ b/starmath/source/symbol.src
@@ -23,98 +23,96 @@
// is the localized version of all symbols that is show in the Ui,
// for Export they have to be in English. The transition between
// both lists is done with GetExportSymbolName() and GetUiSymbolName().
-Resource RID_LOCALIZED_NAMES
+StringArray RID_EXPORT_SYMBOLSET_NAMES
{
- StringArray RID_EXPORT_SYMBOLSET_NAMES
+ ItemList =
{
- ItemList =
- {
- < "Greek" ; > ;
- < "Special" ; > ;
- };
+ < "Greek" ; > ;
+ < "Special" ; > ;
};
- StringArray RID_UI_SYMBOLSET_NAMES
+};
+StringArray RID_UI_SYMBOLSET_NAMES
+{
+ ItemList [ en-US ] =
{
- ItemList [ en-US ] =
- {
- < "Greek" ; > ;
- < "Special" ; > ;
- };
+ < "Greek" ; > ;
+ < "Special" ; > ;
};
- StringArray RID_EXPORT_SYMBOL_NAMES
+};
+StringArray RID_EXPORT_SYMBOL_NAMES
+{
+ ItemList =
{
- ItemList =
- {
- < "alpha" ; > ;
- < "ALPHA" ; > ;
- < "beta" ; > ;
- < "BETA" ; > ;
- < "gamma" ; > ;
- < "GAMMA" ; > ;
- < "delta" ; > ;
- < "DELTA" ; > ;
- < "epsilon" ; > ;
- < "EPSILON" ; > ;
- < "zeta" ; > ;
- < "ZETA" ; > ;
- < "eta" ; > ;
- < "ETA" ; > ;
- < "theta" ; > ;
- < "THETA" ; > ;
- < "iota" ; > ;
- < "IOTA" ; > ;
- < "kappa" ; > ;
- < "KAPPA" ; > ;
- < "lambda" ; > ;
- < "LAMBDA" ; > ;
- < "mu" ; > ;
- < "MU" ; > ;
- < "nu" ; > ;
- < "NU" ; > ;
- < "xi" ; > ;
- < "XI" ; > ;
- < "omicron" ; > ;
- < "OMICRON" ; > ;
- < "pi" ; > ;
- < "PI" ; > ;
- < "rho" ; > ;
- < "RHO" ; > ;
- < "sigma" ; > ;
- < "SIGMA" ; > ;
- < "tau" ; > ;
- < "TAU" ; > ;
- < "upsilon" ; > ;
- < "UPSILON" ; > ;
- < "phi" ; > ;
- < "PHI" ; > ;
- < "chi" ; > ;
- < "CHI" ; > ;
- < "psi" ; > ;
- < "PSI" ; > ;
- < "omega" ; > ;
- < "OMEGA" ; > ;
- < "varepsilon" ; > ;
- < "vartheta" ; > ;
- < "varpi" ; > ;
- < "varrho" ; > ;
- < "varsigma" ; > ;
- < "varphi" ; > ;
- < "element" ; > ;
- < "noelement" ; > ;
- < "strictlylessthan" ; > ;
- < "strictlygreaterthan" ; > ;
- < "notequal" ; > ;
- < "identical" ; > ;
- < "tendto" ; > ;
- < "infinite" ; > ;
- < "angle" ; > ;
- < "perthousand" ; > ;
- < "and" ; > ;
- < "or" ; > ;
- };
+ < "alpha" ; > ;
+ < "ALPHA" ; > ;
+ < "beta" ; > ;
+ < "BETA" ; > ;
+ < "gamma" ; > ;
+ < "GAMMA" ; > ;
+ < "delta" ; > ;
+ < "DELTA" ; > ;
+ < "epsilon" ; > ;
+ < "EPSILON" ; > ;
+ < "zeta" ; > ;
+ < "ZETA" ; > ;
+ < "eta" ; > ;
+ < "ETA" ; > ;
+ < "theta" ; > ;
+ < "THETA" ; > ;
+ < "iota" ; > ;
+ < "IOTA" ; > ;
+ < "kappa" ; > ;
+ < "KAPPA" ; > ;
+ < "lambda" ; > ;
+ < "LAMBDA" ; > ;
+ < "mu" ; > ;
+ < "MU" ; > ;
+ < "nu" ; > ;
+ < "NU" ; > ;
+ < "xi" ; > ;
+ < "XI" ; > ;
+ < "omicron" ; > ;
+ < "OMICRON" ; > ;
+ < "pi" ; > ;
+ < "PI" ; > ;
+ < "rho" ; > ;
+ < "RHO" ; > ;
+ < "sigma" ; > ;
+ < "SIGMA" ; > ;
+ < "tau" ; > ;
+ < "TAU" ; > ;
+ < "upsilon" ; > ;
+ < "UPSILON" ; > ;
+ < "phi" ; > ;
+ < "PHI" ; > ;
+ < "chi" ; > ;
+ < "CHI" ; > ;
+ < "psi" ; > ;
+ < "PSI" ; > ;
+ < "omega" ; > ;
+ < "OMEGA" ; > ;
+ < "varepsilon" ; > ;
+ < "vartheta" ; > ;
+ < "varpi" ; > ;
+ < "varrho" ; > ;
+ < "varsigma" ; > ;
+ < "varphi" ; > ;
+ < "element" ; > ;
+ < "noelement" ; > ;
+ < "strictlylessthan" ; > ;
+ < "strictlygreaterthan" ; > ;
+ < "notequal" ; > ;
+ < "identical" ; > ;
+ < "tendto" ; > ;
+ < "infinite" ; > ;
+ < "angle" ; > ;
+ < "perthousand" ; > ;
+ < "and" ; > ;
+ < "or" ; > ;
};
- StringArray RID_UI_SYMBOL_NAMES
- {
+};
+StringArray RID_UI_SYMBOL_NAMES
+{
ItemList [ en-US ] =
{
< "alpha" ; > ;
@@ -184,7 +182,6 @@ Resource RID_LOCALIZED_NAMES
< "and" ; > ;
< "or" ; > ;
};
- };
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 06609e714f2cb43ac3dc888611ec67af4f4a4773
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Oct 13 09:58:42 2016 +0100
drop unused SID_UNKNOWN resource
Change-Id: Ib12078ec72a61b44339799053cc43a53ba82bba3
diff --git a/include/sfx2/sfxsids.hrc b/include/sfx2/sfxsids.hrc
index 395829b..c24096a 100644
--- a/include/sfx2/sfxsids.hrc
+++ b/include/sfx2/sfxsids.hrc
@@ -38,8 +38,6 @@
#define SID_DOCKWIN_8 SID_DOCKWIN_START+8
#define SID_DOCKWIN_9 SID_DOCKWIN_START+9
-#define SID_UNKNOWN SID_SFX_START
-
// default-ids for application
#define SID_QUITAPP (SID_SFX_START + 300)
#define SID_ABOUT (SID_SFX_START + 301)
diff --git a/sfx2/source/appl/app.src b/sfx2/source/appl/app.src
index 42c9318..3384f4a 100644
--- a/sfx2/source/appl/app.src
+++ b/sfx2/source/appl/app.src
@@ -68,11 +68,6 @@ String STR_NO_ABS_URI_REF
Text [ en-US ] = "\"$(ARG1)\" is not an absolute URL that can be passed to an external application to open it." ;
};
-Resource SID_UNKNOWN
-{
- String 1 "-" ;
-};
-
String GID_INTERN
{
Text [ en-US ] = "Internal" ;
commit 678dbe8f8197815919d7179c2eba17679942fdaa
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Oct 13 09:50:03 2016 +0100
unused src file
Change-Id: I89c57286f09fdbec25d1ee5eeabe9b4ee9ef83e0
diff --git a/sc/source/ui/src/scwarngs.src b/sc/source/ui/src/scwarngs.src
deleted file mode 100644
index 020df88..0000000
--- a/sc/source/ui/src/scwarngs.src
+++ /dev/null
@@ -1,37 +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 .
- */
-#define __RSC
-#include "scwarngs.hxx"
-#include "sc.hrc"
-
-#define SH_MAX 0x7fff
-
-Resource RID_WRNHDLSC
-{
- String ERRCODE_SC_EXPORT_WRN_ASCII & SH_MAX
- {
- Text [ en-US ] = "Only the active sheet could be saved." ;
- };
- String ERRCODE_SC_IMPORT_WRN_RNGOVRFLW & SH_MAX
- {
- Text [ en-US ] = "The number of rows exceeded the maximum. Additional rows were not imported!" ;
- };
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 6db89521e2631434fbfa8b0779d6a93e512863f9
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Oct 13 09:46:21 2016 +0100
flaten array of stringarrays by a level
Change-Id: I44dfe258f2220c5063b1177b67dbef71608ecef8
diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc
index efe0d20..0f57cf6 100644
--- a/cui/source/inc/cuires.hrc
+++ b/cui/source/inc/cuires.hrc
@@ -106,7 +106,6 @@
// treeopt
#define RID_SVXPAGE_COLOR (RID_SVX_START + 60)
#define OFA_TP_LANGUAGES_FOR_SET_DOCUMENT_LANGUAGE ( RID_OFA_START + 256 )
-#define RID_OFADLG_OPTIONS_TREE_PAGES (RID_OFA_START + 116)
// options
#define RID_SVXPAGE_ONLINEUPDATE (RID_SVX_START + 298)
diff --git a/cui/source/inc/treeopt.hxx b/cui/source/inc/treeopt.hxx
index c497b83..7cbbe3a 100644
--- a/cui/source/inc/treeopt.hxx
+++ b/cui/source/inc/treeopt.hxx
@@ -194,7 +194,7 @@ public:
// class OfaPageResource -------------------------------------------------
-class OfaPageResource : public Resource
+class OfaPageResource
{
ResStringArray aGeneralDlgAry;
ResStringArray aInetDlgAry;
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 3ecfdf6..7d968e3 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -1105,7 +1105,6 @@ void OfaTreeOptionsDialog::SelectHdl_Impl()
}
OfaPageResource::OfaPageResource() :
- Resource(CUI_RES(RID_OFADLG_OPTIONS_TREE_PAGES)),
aGeneralDlgAry(CUI_RES(SID_GENERAL_OPTIONS)),
aInetDlgAry(CUI_RES(SID_INET_DLG)),
aLangDlgAry(CUI_RES(SID_LANGUAGE_OPTIONS)),
@@ -1119,7 +1118,6 @@ OfaPageResource::OfaPageResource() :
aFilterDlgAry(CUI_RES(SID_FILTER_DLG)),
aDatasourcesDlgAry(CUI_RES(SID_SB_STARBASEOPTIONS))
{
- FreeResource();
}
SfxItemSet* OfaTreeOptionsDialog::CreateItemSet( sal_uInt16 nId )
diff --git a/cui/source/options/treeopt.src b/cui/source/options/treeopt.src
index 7209e50..4301f79 100644
--- a/cui/source/options/treeopt.src
+++ b/cui/source/options/treeopt.src
@@ -21,159 +21,156 @@
#include "helpid.hrc"
#include <svx/dialogs.hrc>
-Resource RID_OFADLG_OPTIONS_TREE_PAGES
+StringArray SID_GENERAL_OPTIONS
{
- StringArray SID_GENERAL_OPTIONS
+ ItemList [ en-US ] =
{
- ItemList [ en-US ] =
- {
- < "%PRODUCTNAME" ; 0; > ;
- < "User Data" ; RID_SFXPAGE_GENERAL; > ;
- < "General" ; OFA_TP_MISC; > ;
- < "Memory" ; OFA_TP_MEMORY; > ;
- < "View" ; OFA_TP_VIEW ; > ;
- < "Print" ; RID_SFXPAGE_PRINTOPTIONS; > ;
- < "Paths" ; RID_SFXPAGE_PATH; > ;
- < "Fonts" ; RID_SVX_FONT_SUBSTITUTION ; > ;
- < "Security" ; RID_SVXPAGE_INET_SECURITY ; > ;
- < "Personalization" ; RID_SVXPAGE_PERSONALIZATION ; > ;
- < "Application Colors" ; RID_SVXPAGE_COLORCONFIG ; > ;
- < "Accessibility" ; RID_SVXPAGE_ACCESSIBILITYCONFIG ; > ;
- < "Advanced" ; RID_SVXPAGE_OPTIONS_JAVA ; > ;
- < "Basic IDE Options" ; RID_SVXPAGE_BASICIDE_OPTIONS ; > ;
- < "Online Update" ; RID_SVXPAGE_ONLINEUPDATE ; > ;
- < "OpenCL" ; RID_SVXPAGE_OPENCL ; > ;
- };
+ < "%PRODUCTNAME" ; 0; > ;
+ < "User Data" ; RID_SFXPAGE_GENERAL; > ;
+ < "General" ; OFA_TP_MISC; > ;
+ < "Memory" ; OFA_TP_MEMORY; > ;
+ < "View" ; OFA_TP_VIEW ; > ;
+ < "Print" ; RID_SFXPAGE_PRINTOPTIONS; > ;
+ < "Paths" ; RID_SFXPAGE_PATH; > ;
+ < "Fonts" ; RID_SVX_FONT_SUBSTITUTION ; > ;
+ < "Security" ; RID_SVXPAGE_INET_SECURITY ; > ;
+ < "Personalization" ; RID_SVXPAGE_PERSONALIZATION ; > ;
+ < "Application Colors" ; RID_SVXPAGE_COLORCONFIG ; > ;
+ < "Accessibility" ; RID_SVXPAGE_ACCESSIBILITYCONFIG ; > ;
+ < "Advanced" ; RID_SVXPAGE_OPTIONS_JAVA ; > ;
+ < "Basic IDE Options" ; RID_SVXPAGE_BASICIDE_OPTIONS ; > ;
+ < "Online Update" ; RID_SVXPAGE_ONLINEUPDATE ; > ;
+ < "OpenCL" ; RID_SVXPAGE_OPENCL ; > ;
};
- StringArray SID_LANGUAGE_OPTIONS
+};
+StringArray SID_LANGUAGE_OPTIONS
+{
+ ItemList [ en-US ] =
{
- ItemList [ en-US ] =
- {
- < "Language Settings" ; 0; > ;
- < "Languages"; OFA_TP_LANGUAGES; > ;
- < "Writing Aids" ; RID_SFXPAGE_LINGU; > ;
- < "Searching in Japanese" ; RID_SVXPAGE_JSEARCH_OPTIONS; > ;
- < "Asian Layout" ; RID_SVXPAGE_ASIAN_LAYOUT; > ;
- < "Complex Text Layout" ; RID_SVXPAGE_OPTIONS_CTL; >;
- };
+ < "Language Settings" ; 0; > ;
+ < "Languages"; OFA_TP_LANGUAGES; > ;
+ < "Writing Aids" ; RID_SFXPAGE_LINGU; > ;
+ < "Searching in Japanese" ; RID_SVXPAGE_JSEARCH_OPTIONS; > ;
+ < "Asian Layout" ; RID_SVXPAGE_ASIAN_LAYOUT; > ;
+ < "Complex Text Layout" ; RID_SVXPAGE_OPTIONS_CTL; >;
};
- StringArray SID_INET_DLG
+};
+StringArray SID_INET_DLG
+{
+ ItemList [ en-US ] =
{
- ItemList [ en-US ] =
- {
- < "Internet" ; 0; > ;
- < "Proxy" ; RID_SVXPAGE_INET_PROXY; > ;
- < "E-mail" ; RID_SVXPAGE_INET_MAIL; > ;
- };
+ < "Internet" ; 0; > ;
+ < "Proxy" ; RID_SVXPAGE_INET_PROXY; > ;
+ < "E-mail" ; RID_SVXPAGE_INET_MAIL; > ;
};
- StringArray SID_SW_EDITOPTIONS
+};
+StringArray SID_SW_EDITOPTIONS
+{
+ ItemList [ en-US ] =
{
- ItemList [ en-US ] =
- {
- < "%PRODUCTNAME Writer" ; 0; > ;
- < "General" ; RID_SW_TP_OPTLOAD_PAGE ; > ;
- < "View" ; RID_SW_TP_CONTENT_OPT ;> ;
- < "Formatting Aids" ; RID_SW_TP_OPTSHDWCRSR ; > ;
- < "Grid" ; RID_SVXPAGE_GRID ; > ;
- < "Basic Fonts (Western)" ;RID_SW_TP_STD_FONT ; > ;
- < "Basic Fonts (Asian)" ;RID_SW_TP_STD_FONT_CJK ; > ;
- < "Basic Fonts (CTL)" ; RID_SW_TP_STD_FONT_CTL ; > ;
- < "Print" ; RID_SW_TP_OPTPRINT_PAGE ; > ;
- < "Table" ; RID_SW_TP_OPTTABLE_PAGE ; > ;
- < "Changes" ; RID_SW_TP_REDLINE_OPT ; > ;
- < "Comparison" ; RID_SW_TP_COMPARISON_OPT ; > ;
- < "Compatibility" ; RID_SW_TP_OPTCOMPATIBILITY_PAGE ; > ;
- < "AutoCaption" ; RID_SW_TP_OPTCAPTION_PAGE ; > ;
- < "Mail Merge E-mail" ; RID_SW_TP_MAILCONFIG ; >;
- };
+ < "%PRODUCTNAME Writer" ; 0; > ;
+ < "General" ; RID_SW_TP_OPTLOAD_PAGE ; > ;
+ < "View" ; RID_SW_TP_CONTENT_OPT ;> ;
+ < "Formatting Aids" ; RID_SW_TP_OPTSHDWCRSR ; > ;
+ < "Grid" ; RID_SVXPAGE_GRID ; > ;
+ < "Basic Fonts (Western)" ;RID_SW_TP_STD_FONT ; > ;
+ < "Basic Fonts (Asian)" ;RID_SW_TP_STD_FONT_CJK ; > ;
+ < "Basic Fonts (CTL)" ; RID_SW_TP_STD_FONT_CTL ; > ;
+ < "Print" ; RID_SW_TP_OPTPRINT_PAGE ; > ;
+ < "Table" ; RID_SW_TP_OPTTABLE_PAGE ; > ;
+ < "Changes" ; RID_SW_TP_REDLINE_OPT ; > ;
+ < "Comparison" ; RID_SW_TP_COMPARISON_OPT ; > ;
+ < "Compatibility" ; RID_SW_TP_OPTCOMPATIBILITY_PAGE ; > ;
+ < "AutoCaption" ; RID_SW_TP_OPTCAPTION_PAGE ; > ;
+ < "Mail Merge E-mail" ; RID_SW_TP_MAILCONFIG ; >;
};
- StringArray SID_SW_ONLINEOPTIONS
+};
+StringArray SID_SW_ONLINEOPTIONS
+{
+ ItemList [ en-US ] =
{
- ItemList [ en-US ] =
- {
- < "%PRODUCTNAME Writer/Web" ; 0; > ;
- < "View" ; RID_SW_TP_HTML_CONTENT_OPT ;> ;
- < "Formatting Aids" ; RID_SW_TP_HTML_OPTSHDWCRSR ; > ;
- < "Grid" ; RID_SW_TP_HTML_OPTGRID_PAGE ; > ;
- < "Print" ; RID_SW_TP_HTML_OPTPRINT_PAGE ; > ;
- < "Table" ; RID_SW_TP_HTML_OPTTABLE_PAGE ; > ;
- < "Background" ; RID_SW_TP_BACKGROUND ; > ;
- };
+ < "%PRODUCTNAME Writer/Web" ; 0; > ;
+ < "View" ; RID_SW_TP_HTML_CONTENT_OPT ;> ;
+ < "Formatting Aids" ; RID_SW_TP_HTML_OPTSHDWCRSR ; > ;
+ < "Grid" ; RID_SW_TP_HTML_OPTGRID_PAGE ; > ;
+ < "Print" ; RID_SW_TP_HTML_OPTPRINT_PAGE ; > ;
+ < "Table" ; RID_SW_TP_HTML_OPTTABLE_PAGE ; > ;
+ < "Background" ; RID_SW_TP_BACKGROUND ; > ;
};
- StringArray SID_SM_EDITOPTIONS
+};
+StringArray SID_SM_EDITOPTIONS
+{
+ ItemList [ en-US ] =
{
- ItemList [ en-US ] =
- {
- < "%PRODUCTNAME Math" ; 0; > ;
- < "Settings" ; SID_SM_TP_PRINTOPTIONS;> ;
- };
+ < "%PRODUCTNAME Math" ; 0; > ;
+ < "Settings" ; SID_SM_TP_PRINTOPTIONS;> ;
};
- StringArray SID_SC_EDITOPTIONS
+};
+StringArray SID_SC_EDITOPTIONS
+{
+ ItemList [ en-US ] =
{
- ItemList [ en-US ] =
- {
- < "%PRODUCTNAME Calc" ; 0; > ;
- < "General" ; SID_SC_TP_LAYOUT ;> ;
- < "Defaults" ; RID_SC_TP_DEFAULTS ;> ;
- < "View" ; SID_SC_TP_CONTENT ;> ;
- < "Calculate" ; SID_SC_TP_CALC ;> ;
- < "Formula" ; SID_SC_TP_FORMULA ;> ;
- < "Sort Lists" ; SID_SC_TP_USERLISTS ;> ;
- < "Changes" ; SID_SC_TP_CHANGES ;> ;
- < "Compatibility" ; SID_SC_TP_COMPATIBILITY ;> ;
- < "Grid" ; SID_SC_TP_GRID ;> ;
- < "Print" ; RID_SC_TP_PRINT ;> ;
- };
+ < "%PRODUCTNAME Calc" ; 0; > ;
+ < "General" ; SID_SC_TP_LAYOUT ;> ;
+ < "Defaults" ; RID_SC_TP_DEFAULTS ;> ;
+ < "View" ; SID_SC_TP_CONTENT ;> ;
+ < "Calculate" ; SID_SC_TP_CALC ;> ;
+ < "Formula" ; SID_SC_TP_FORMULA ;> ;
+ < "Sort Lists" ; SID_SC_TP_USERLISTS ;> ;
+ < "Changes" ; SID_SC_TP_CHANGES ;> ;
+ < "Compatibility" ; SID_SC_TP_COMPATIBILITY ;> ;
+ < "Grid" ; SID_SC_TP_GRID ;> ;
+ < "Print" ; RID_SC_TP_PRINT ;> ;
};
- StringArray SID_SD_EDITOPTIONS
+};
+StringArray SID_SD_EDITOPTIONS
+{
+ ItemList [ en-US ] =
{
- ItemList [ en-US ] =
- {
- < "%PRODUCTNAME Impress" ; 0; > ;
- < "General"; SID_SI_TP_MISC ; > ;
- < "View" ; SID_SI_TP_CONTENTS ; > ;
- < "Grid" ; SID_SI_TP_SNAP ; > ;
- < "Print" ; SID_SI_TP_PRINT ; > ;
- };
+ < "%PRODUCTNAME Impress" ; 0; > ;
+ < "General"; SID_SI_TP_MISC ; > ;
+ < "View" ; SID_SI_TP_CONTENTS ; > ;
+ < "Grid" ; SID_SI_TP_SNAP ; > ;
+ < "Print" ; SID_SI_TP_PRINT ; > ;
};
- StringArray SID_SD_GRAPHIC_OPTIONS
+};
+StringArray SID_SD_GRAPHIC_OPTIONS
+{
+ ItemList [ en-US ] =
{
- ItemList [ en-US ] =
- {
- < "%PRODUCTNAME Draw" ; 0; > ;
- < "General" ; SID_SD_TP_MISC ; > ;
- < "View" ; SID_SD_TP_CONTENTS ; > ;
- < "Grid" ; SID_SD_TP_SNAP ; > ;
- < "Print" ; SID_SD_TP_PRINT ; > ;
- };
+ < "%PRODUCTNAME Draw" ; 0; > ;
+ < "General" ; SID_SD_TP_MISC ; > ;
+ < "View" ; SID_SD_TP_CONTENTS ; > ;
+ < "Grid" ; SID_SD_TP_SNAP ; > ;
+ < "Print" ; SID_SD_TP_PRINT ; > ;
};
- StringArray SID_SCH_EDITOPTIONS
+};
+StringArray SID_SCH_EDITOPTIONS
+{
+ ItemList [ en-US ] =
{
- ItemList [ en-US ] =
- {
- < "Charts" ; 0; > ;
- < "Default Colors" ; RID_OPTPAGE_CHART_DEFCOLORS ; > ;
- };
+ < "Charts" ; 0; > ;
+ < "Default Colors" ; RID_OPTPAGE_CHART_DEFCOLORS ; > ;
};
- StringArray SID_FILTER_DLG
+};
+StringArray SID_FILTER_DLG
+{
+ ItemList [ en-US ] =
{
- ItemList [ en-US ] =
- {
- < "Load/Save" ; 0; > ;
- < "General" ; RID_SFXPAGE_SAVE; > ;
- < "VBA Properties" ; SID_OPTFILTER_MSOFFICE; > ;
- < "Microsoft Office" ; RID_OFAPAGE_MSFILTEROPT2; > ;
- < "HTML Compatibility" ; RID_OFAPAGE_HTMLOPT ; > ;
- };
+ < "Load/Save" ; 0; > ;
+ < "General" ; RID_SFXPAGE_SAVE; > ;
+ < "VBA Properties" ; SID_OPTFILTER_MSOFFICE; > ;
+ < "Microsoft Office" ; RID_OFAPAGE_MSFILTEROPT2; > ;
+ < "HTML Compatibility" ; RID_OFAPAGE_HTMLOPT ; > ;
};
- StringArray SID_SB_STARBASEOPTIONS
+};
+StringArray SID_SB_STARBASEOPTIONS
+{
+ ItemList [ en-US ] =
{
- ItemList [ en-US ] =
- {
- < "%PRODUCTNAME Base" ; 0; > ;
- < "Connections" ; SID_SB_CONNECTIONPOOLING; > ;
- < "Databases" ; SID_SB_DBREGISTEROPTIONS; > ;
- };
+ < "%PRODUCTNAME Base" ; 0; > ;
+ < "Connections" ; SID_SB_CONNECTIONPOOLING; > ;
+ < "Databases" ; SID_SB_DBREGISTEROPTIONS; > ;
};
};
More information about the Libreoffice-commits
mailing list