[Libreoffice-commits] .: cui/source dbaccess/source fpicker/source framework/inc framework/source scripting/source sfx2/inc svl/source svtools/inc svtools/source svx/source unotools/source

2012-04-20 Thread Thomas Arnhold
 cui/source/inc/acccfg.hxx  |6 -
 cui/source/inc/cfgutil.hxx |4 ---
 dbaccess/source/ui/control/sqledit.cxx |6 -
 fpicker/source/win32/filepicker/IVistaFilePickerInternalNotify.hxx |8 
---
 fpicker/source/win32/filepicker/VistaFilePicker.hxx|8 
---
 fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx|8 
---
 fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx|8 
---
 fpicker/source/win32/filepicker/asyncrequests.hxx  |8 
---
 fpicker/source/win32/filepicker/vistatypes.h   |8 
---
 framework/inc/framework/preventduplicateinteraction.hxx|   10 
+
 framework/inc/framework/titlehelper.hxx|   10 
+
 framework/source/inc/accelerators/storageholder.hxx|   10 
+
 framework/source/uielement/statusbarmanager.cxx|4 ---
 scripting/source/inc/util/MiscUtils.hxx|4 +--
 scripting/source/protocolhandler/scripthandler.cxx |3 --
 scripting/source/provider/ActiveMSPList.hxx|4 +--
 scripting/source/provider/BrowseNodeFactoryImpl.hxx|4 +--
 scripting/source/provider/MasterScriptProvider.hxx |4 +--
 scripting/source/provider/MasterScriptProviderFactory.hxx  |4 +--
 scripting/source/provider/ProviderCache.hxx|4 +--
 scripting/source/provider/ScriptImpl.hxx   |5 +---
 scripting/source/provider/ScriptingContext.hxx |5 ++--
 scripting/source/provider/URIHelper.hxx|4 +--
 scripting/source/runtimemgr/ScriptNameResolverImpl.hxx |4 +--
 scripting/source/runtimemgr/ScriptRuntimeManager.hxx   |4 +--
 scripting/source/runtimemgr/StorageBridge.hxx  |4 +--
 scripting/source/runtimemgr/StorageBridgeFactory.hxx   |4 +--
 sfx2/inc/sfx2/sfxbasemodel.hxx |9 
+---
 svl/source/config/itemholder2.hxx  |   11 
--
 svtools/inc/svtools/acceleratorexecute.hxx |8 
---
 svtools/source/config/itemholder2.hxx  |   10 
-
 svx/source/inc/docrecovery.hxx |   10 
+
 unotools/source/config/itemholder1.hxx |6 -
 unotools/source/i18n/instance.hxx  |3 --
 34 files changed, 53 insertions(+), 159 deletions(-)

New commits:
commit 2abba84aa7c639011956721a4922653130dd09a6
Author: Thomas Arnhold 
Date:   Sat Apr 21 01:30:38 2012 +0200

Replace css macro with namespace for nicer namespacing

diff --git a/cui/source/inc/acccfg.hxx b/cui/source/inc/acccfg.hxx
index ec03c4a..1cfdc81 100644
--- a/cui/source/inc/acccfg.hxx
+++ b/cui/source/inc/acccfg.hxx
@@ -56,7 +56,7 @@
 #include 
 #include "cfgutil.hxx"
 
-#define css ::com::sun::star
+namespace css = ::com::sun::star;
 
 class SfxMacroInfoItem;
 class SfxConfigGroupListBox_Impl;
@@ -219,10 +219,6 @@ public:
 virtual ~SvxShortcutAssignDlg();
 };
 
-
-
-#undef css
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/inc/cfgutil.hxx b/cui/source/inc/cfgutil.hxx
index 94c764b..4e0fd27 100644
--- a/cui/source/inc/cfgutil.hxx
+++ b/cui/source/inc/cfgutil.hxx
@@ -51,7 +51,7 @@ class SfxMacroInfoItem;
 struct SfxStyleInfo_Impl;
 struct SfxStylesInfo_Impl;
 
-#define css ::com::sun::star
+namespace css = ::com::sun::star;
 
 struct SfxStyleInfo_Impl
 {
@@ -203,8 +203,6 @@ public:
 voidSetStylesInfo(SfxStylesInfo_Impl* pStyles);
 };
 
-#undef css
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/control/sqledit.cxx 
b/dbaccess/source/ui/control/sqledit.cxx
index 765d6a7..3161879 100644
--- a/dbaccess/source/ui/control/sqledit.cxx
+++ b/dbaccess/source/ui/control/sqledit.cxx
@@ -45,11 +45,7 @@
 
 #include 
 
-namespace {
-
-namespace css = com::sun::star;
-
-}
+namespace css = ::com::sun::star;
 
 //
 // OSqlEdit
diff --git a/fpicker/source/win32/filepicker/IVistaFilePickerInternalNotify.hxx 
b/fpicker/source/win32/filepicker/IVistaFilePickerInternalNotify.hxx
index 47909d7..ca1b223 100644
--- a/fpicker/source/win32/filepicker/IVistaFilePickerInternalNotify.hxx
+++ b/fpicker/source/win32/filepicker/IVistaFilePickerInternalNotify.hxx
@@ -45,11 +45,7 @@
 // namespace
 //-
 
-#ifdef css
-#error "Clash on using CSS as namespace define."
-#else
-   

[Libreoffice-commits] .: cui/source dbaccess/source

2012-03-01 Thread Stephan Bergmann
 cui/source/options/optgdlg.hxx  |2 +-
 dbaccess/source/ui/dlg/dsselect.hxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 906ca2e0e58556353a40670828e111986285315a
Author: Stephan Bergmann 
Date:   Fri Mar 2 08:55:49 2012 +0100

WNT-only IMPL_LINK_NOARG fixes

diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx
index cf69c7d..817cf46 100644
--- a/cui/source/options/optgdlg.hxx
+++ b/cui/source/options/optgdlg.hxx
@@ -80,7 +80,7 @@ private:
 DECL_LINK(HelpCheckHdl_Impl, void *);
 DECL_LINK(HelpAgentResetHdl_Impl, void *);
 #ifdef WNT
-DECL_LINK( OnFileDlgToggled, CheckBox* );
+DECL_LINK( OnFileDlgToggled, void* );
 #endif
 protected:
 virtual int DeactivatePage( SfxItemSet* pSet = NULL );
diff --git a/dbaccess/source/ui/dlg/dsselect.hxx 
b/dbaccess/source/ui/dlg/dsselect.hxx
index 56566c0..0081cb9 100644
--- a/dbaccess/source/ui/dlg/dsselect.hxx
+++ b/dbaccess/source/ui/dlg/dsselect.hxx
@@ -80,7 +80,7 @@ public:
 protected:
 DECL_LINK( ListDblClickHdl, ListBox * );
 #ifdef HAVE_ODBC_ADMINISTRATION
-DECL_LINK( ManageClickHdl, PushButton * );
+DECL_LINK( ManageClickHdl, void* );
 DECL_LINK( ManageProcessFinished, void* );
 #endif
 void fillListBox(const StringBag& _rDatasources);
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: cui/source dbaccess/source extensions/source sc/source sd/source svx/source sw/source

2012-01-02 Thread Lior Kaplan
 cui/source/customize/cfg.src   |   61 -
 cui/source/dialogs/sdrcelldlg.src  |6 --
 cui/source/options/optgdlg.src |1 
 cui/source/tabpages/autocdlg.src   |2 
 dbaccess/source/ui/app/app.src |1 
 extensions/source/bibliography/toolbar.src |1 
 sc/source/ui/src/sortdlg.src   |3 -
 sd/source/ui/dlg/celltempl.src |4 -
 svx/source/dialog/linkwarn.src |4 -
 sw/source/ui/config/optload.src|1 
 sw/source/ui/misc/pggrid.src   |2 
 11 files changed, 86 deletions(-)

New commits:
commit 14c0e038c9c33dc59cbf6e5ec81d36779f28b004
Author: Lior Kaplan 
Date:   Mon Jan 2 22:35:33 2012 +0200

Clean non English strings in the code
we do translation differently.

diff --git a/cui/source/customize/cfg.src b/cui/source/customize/cfg.src
index 66ac237..4fe3b13 100644
--- a/cui/source/customize/cfg.src
+++ b/cui/source/customize/cfg.src
@@ -31,7 +31,6 @@
 TabDialog RID_SVXDLG_CUSTOMIZE
 {
 OutputSize = TRUE ;
-Text [ de ] = "Anpassen" ;
 Text [ en-US ] = "Customize" ;
 Moveable = TRUE ;
 SvLook = TRUE ;
@@ -43,28 +42,24 @@ TabDialog RID_SVXDLG_CUSTOMIZE
 PageItem
 {
 Identifier = RID_SVXPAGE_MENUS ;
-Text [ de ] = "Menüs" ;
 Text [ en-US ] = "Menus" ;
 PageResID = 300 ;
 };
 PageItem
 {
 Identifier = RID_SVXPAGE_KEYBOARD ;
-Text [ de ] = "Tastatur" ;
 Text [ en-US ] = "Keyboard" ;
 PageResID = 301 ;
 };
 PageItem
 {
 Identifier = RID_SVXPAGE_TOOLBARS ;
-Text [ de ] = "Symbolleisten" ;
 Text [ en-US ] = "Toolbars" ;
 PageResID = 302 ;
 };
 PageItem
 {
 Identifier = RID_SVXPAGE_EVENTS ;
-Text [ de ] = "Ereignisse" ;
 Text [ en-US ] = "Events" ;
 PageResID = 303 ;
 };
@@ -73,47 +68,36 @@ TabDialog RID_SVXDLG_CUSTOMIZE
 };
 
 #define TEXT_MENU \
-Text [ de ] = "Menü" ; \
 Text [ en-US ] = "Menu" ;\
 
 #define TEXT_BEGIN_GROUP \
-Text [ de ] = "Gruppe beginnen" ; \
 Text [ en-US ] = "Begin a Group" ;\
 
 #define TEXT_RENAME \
-Text [ de ] = "Umbenennen..." ; \
 Text [ en-US ] = "Rename..." ;\
 
 #define TEXT_DELETE \
-Text [ de ] = "Entfernen..." ; \
 Text [ en-US ] = "Delete..." ;\
 
 #define TEXT_DELETE_NODOTS \
-Text [ de ] = "Entfernen" ; \
 Text [ en-US ] = "Delete" ;\
 
 #define TEXT_MOVE \
-Text [ de ] = "Verschieben..." ; \
 Text [ en-US ] = "Move..." ;\
 
 #define TEXT_DEFAULT_STYLE \
-Text [ de ] = "Standard Einstellungen herstellen" ; \
 Text [ en-US ] = "Restore Default Settings" ;\
 
 #define TEXT_DEFAULT_COMMAND \
-Text [ de ] = "Standardbefehl ~wiederherstellen" ; \
 Text [ en-US ] = "Restore Default Command" ;\
 
 #define TEXT_TEXT_ONLY \
-Text [ de ] = "Nur Text" ; \
 Text [ en-US ] = "Text only" ;\
 
 #define TEXT_TOOLBAR_NAME \
-Text [ de ] = "Name der Symbolleiste" ; \
 Text [ en-US ] = "Toolbar Name" ;\
 
 #define TEXT_SAVE_IN \
-Text [ de ] = "Speichern in" ; \
 Text [ en-US ] = "Save In" ;\
 
 TabPage RID_SVXPAGE_MENUS
@@ -125,7 +109,6 @@ TabPage RID_SVXPAGE_MENUS
 {
 Pos = MAP_APPFONT ( 6 , 11 ) ;
 Size = MAP_APPFONT ( 261 , 8 ) ;
-Text [ de ] = "%PRODUCTNAME %MODULENAME Menüs" ;
 Text [ en-US ] = "%PRODUCTNAME %MODULENAME Menus" ;
 };
 FixedText FT_MENUS
@@ -148,7 +131,6 @@ TabPage RID_SVXPAGE_MENUS
 Pos = MAP_APPFONT ( 192 , 22 ) ;
 Size = MAP_APPFONT ( 75 , 14 ) ;
 TabStop = TRUE ;
-Text [ de ] = "Neu..." ;
 Text [ en-US ] = "New..." ;
 };
 MenuButton BTN_CHANGE
@@ -163,7 +145,6 @@ TabPage RID_SVXPAGE_MENUS
 {
 Pos = MAP_APPFONT ( 6 , 56 ) ;
 Size = MAP_APPFONT ( 261 , 8 ) ;
-Text [ de ] = "Menüinhalt" ;
 Text [ en-US ] = "Menu Content" ;
 };
 FixedText GRP_MENU_ENTRIES
@@ -171,7 +152,6 @@ TabPage RID_SVXPAGE_MENUS
 Pos = MAP_APPFONT ( 9 , 67 ) ;
 Size = MAP_APPFONT ( 55 , 8 ) ;
 Group = TRUE ;
-Text [ de ] = "Einträge" ;
 Text [ en-US ] = "Entries" ;
 };
 Control BOX_ENTRIES
@@ -188,7 +168,6 @@ TabPage RID_SVXPAGE_MENUS
 Pos = MAP_APPFONT ( 192 , 67 ) ;
 Size = MAP_APPFONT ( 75 , 14 ) ;
 TabStop = TRUE ;
-Text [ de ] = "Hinzufügen..." ;
 Text [ en-US ] = "Add..." ;
 };
 MenuButton BTN_CHANGE_ENTRY
@@ -197,7 +176,6 @@ TabPage RID_SVXPAGE_MENUS
 Pos = MAP_APPFONT ( 192 , 84 ) ;
 Size = MAP_APPFONT ( 75 , 14 ) ;
 TabStop = TRUE ;
-Text [ de ] = "Ändern" ;
 

[Libreoffice-commits] .: cui/source dbaccess/source libxmlsec/xmlsec1-customkeymanage.patch officecfg/registry shell/source xmlsecurity/tools

2011-11-26 Thread Korrawit Pruegsanusak
 cui/source/options/optsave.src  |  
  2 +-
 dbaccess/source/ui/tabledesign/TableController.cxx  |  
  2 +-
 libxmlsec/xmlsec1-customkeymanage.patch |  
  2 +-
 officecfg/registry/schema/org/openoffice/Office/OOoImprovement/Settings.xcs |  
  2 +-
 shell/source/win32/ooofilereader/metainforeader.cxx |  
  4 ++--
 shell/source/win32/shlxthandler/infotips/infotips.cxx   |  
  6 +++---
 xmlsecurity/tools/standalone/csfit/certmngr.cxx |  
  2 +-
 xmlsecurity/tools/standalone/mscsfit/certmngr.cxx   |  
  2 +-
 8 files changed, 11 insertions(+), 11 deletions(-)

New commits:
commit c5710d4700e9b3ab854819cc8ce6c70d0654f5dc
Author: Korrawit Pruegsanusak 
Date:   Sun Nov 27 14:40:43 2011 +0700

s/infomation/information/

diff --git a/cui/source/options/optsave.src b/cui/source/options/optsave.src
index 91c301c..da94bd4 100644
--- a/cui/source/options/optsave.src
+++ b/cui/source/options/optsave.src
@@ -230,7 +230,7 @@ TabPage RID_SFXPAGE_SAVE
 Pos = MAP_APPFONT ( 23 , 169 ) ;
 Size = MAP_APPFONT ( 239 , 8 ) ;
 Hide = TRUE;
-Text [ en-US ] = "Not using ODF 1.2 Extended may cause infomation to 
be lost.";
+Text [ en-US ] = "Not using ODF 1.2 Extended may cause information to 
be lost.";
 Text [ x-comment ] = "EN-US, the term 'extended' must not be 
translated.";
 };
 Image IMG_ODF_WARNING
diff --git a/dbaccess/source/ui/tabledesign/TableController.cxx 
b/dbaccess/source/ui/tabledesign/TableController.cxx
index b79eba4..cd5ca46 100644
--- a/dbaccess/source/ui/tabledesign/TableController.cxx
+++ b/dbaccess/source/ui/tabledesign/TableController.cxx
@@ -945,7 +945,7 @@ void OTableController::loadData()
 if(aTypeIter == m_aTypeInfo.end())
 aTypeIter = m_aTypeInfo.begin();
 
-OSL_ENSURE(aTypeIter != m_aTypeInfo.end(),"We have no type infomation!");
+OSL_ENSURE(aTypeIter != m_aTypeInfo.end(),"We have no type information!");
 
 bool bReadRow = !isAddAllowed();
 for(sal_Int32 i=m_vRowList.size(); i < NEWCOLS; i++ )
diff --git a/libxmlsec/xmlsec1-customkeymanage.patch 
b/libxmlsec/xmlsec1-customkeymanage.patch
index 8bc97c4..8a93368 100644
--- a/libxmlsec/xmlsec1-customkeymanage.patch
+++ b/libxmlsec/xmlsec1-customkeymanage.patch
@@ -796,7 +796,7 @@
 +
 +/**
 + * xmlSecNssAppliedKeysMngrCreate:
-+ * @slot: array of pointers to NSS PKCS#11 slot 
infomation.
++ * @slot: array of pointers to NSS PKCS#11 slot 
information.
 + * @cSlots:   number of slots in the array
 + * @handler:  the pointer to NSS certificate database.
 + *
diff --git 
a/officecfg/registry/schema/org/openoffice/Office/OOoImprovement/Settings.xcs 
b/officecfg/registry/schema/org/openoffice/Office/OOoImprovement/Settings.xcs
index e2d420a..a4339cc 100644
--- 
a/officecfg/registry/schema/org/openoffice/Office/OOoImprovement/Settings.xcs
+++ 
b/officecfg/registry/schema/org/openoffice/Office/OOoImprovement/Settings.xcs
@@ -38,7 +38,7 @@
   
   
 
-  the url where additional infomation can be found.
+  the url where additional information can be found.
 
 
http://wiki.documentfoundation.org/UX/LibreOffice_User_Feedback_Program
   
diff --git a/shell/source/win32/ooofilereader/metainforeader.cxx 
b/shell/source/win32/ooofilereader/metainforeader.cxx
index 2f7a08d..2848de3 100644
--- a/shell/source/win32/ooofilereader/metainforeader.cxx
+++ b/shell/source/win32/ooofilereader/metainforeader.cxx
@@ -51,7 +51,7 @@ CBaseReader( DocumentName )
 m_pSimple_Builder = new CSimpleTag( );
 m_pDummy_Builder   = new CDummyTag( );
 
-//retrieve all infomation that is useful
+//retrieve all information that is useful
 m_AllMetaInfo[META_INFO_AUTHOR]   = EMPTY_XML_TAG;
 m_AllMetaInfo[META_INFO_TITLE]= EMPTY_XML_TAG;
 m_AllMetaInfo[META_INFO_SUBJECT]  = EMPTY_XML_TAG;
@@ -92,7 +92,7 @@ try
 m_pSimple_Builder = new CSimpleTag( );
 m_pDummy_Builder   = new CDummyTag( );
 
-//retrieve all infomation that is useful
+//retrieve all information that is useful
 m_AllMetaInfo[META_INFO_AUTHOR]   = EMPTY_XML_TAG;
 m_AllMetaInfo[META_INFO_TITLE]= EMPTY_XML_TAG;
 m_AllMetaInfo[META_INFO_SUBJECT]  = EMPTY_XML_TAG;
diff --git a/shell/source/win32/shlxthandler/infotips/infotips.cxx 
b/shell/source/win32/shlxthandler/infotips/infotips.cxx
index 8c6d701..510ba0f 100644
--- a/shell/source/win32/shlxthandler/infotips/infotips.cxx
+++ b/shell/source/win32/shlxthandler/infotips/infotips.cxx
@@ -114,7 +114,7 @@ ULONG STDMETHODCALLTYPE CInfoTip::Release( void)
 
 //helper functions for GetInfoTip 
fun

[Libreoffice-commits] .: cui/source dbaccess/source framework/source readlicense_oo/docs reportdesign/source sc/source sd/source svx/source sw/source

2011-11-08 Thread Andras Timar
 cui/source/dialogs/sdrcelldlg.src|6 --
 cui/source/options/optchart.src  |5 --
 dbaccess/source/ui/inc/toolbox_tmpl.hrc  |1 
 framework/source/classes/resource.src|7 ---
 reportdesign/source/ui/dlg/dlgpage.src   |   16 ---
 reportdesign/source/ui/inspection/inspection.src |2 
 reportdesign/source/ui/report/report.src |   13 -
 sc/source/ui/drawfunc/objdraw.src|   25 ---
 sc/source/ui/src/sortdlg.src |1 
 sd/source/core/glob.src  |1 
 svx/source/stbctrls/stbctrls.src |1 
 sw/source/ui/config/optdlg.src   |1 
 sw/source/ui/config/optload.src  |1 
 sw/source/ui/inc/toolbox.hrc |3 -
 sw/source/ui/lingu/olmenu.src|1 
 sw/source/ui/misc/titlepage.src  |   14 --
 sw/source/ui/shells/shells.src   |   50 ---
 17 files changed, 148 deletions(-)

New commits:
commit a2dacd920513485140254729f23ed932c52cdad4
Author: Andras Timar 
Date:   Tue Nov 8 11:28:33 2011 +0100

remove empty Text [ x-comment ] entries

diff --git a/cui/source/dialogs/sdrcelldlg.src 
b/cui/source/dialogs/sdrcelldlg.src
index 7f03cc9..ebb5126 100644
--- a/cui/source/dialogs/sdrcelldlg.src
+++ b/cui/source/dialogs/sdrcelldlg.src
@@ -50,7 +50,6 @@ TabDialog RID_SVX_FORMAT_CELLS_DLG
 PageResID = RID_SVXPAGE_CHAR_NAME ;
 Text [ de ] = "Schrift" ;
 Text [ en-US ] = "Font" ;
-Text [ x-comment ] = " ";
 };
 PageItem
 {
@@ -58,7 +57,6 @@ TabDialog RID_SVX_FORMAT_CELLS_DLG
 PageResID = RID_SVXPAGE_CHAR_EFFECTS ;
 Text [ de ] = "Schrifteffekt" ;
 Text [ en-US ] = "Font Effects" ;
-Text [ x-comment ] = " ";
 };
 PageItem
 {
@@ -66,7 +64,6 @@ TabDialog RID_SVX_FORMAT_CELLS_DLG
 PageResID = RID_SVXPAGE_BORDER;
 Text [ de ] = "Umrandung" ;
 Text [ en-US ] = "Borders" ;
-Text [ x-comment ] = " ";
 };
 PageItem
 {
@@ -74,7 +71,6 @@ TabDialog RID_SVX_FORMAT_CELLS_DLG
 PageResID = RID_SVXPAGE_AREA;
 Text [ de ] = "Hintergrund";
 Text [ en-US ] = "Background";
-Text [ x-comment ] = " ";
 };
 };
 };
@@ -103,7 +99,5 @@ TabDialog RID_SVX_FORMAT_CELLS_DLG
 Text [ de ] = "Zurück" ;
 Text [ en-US ] = "Return" ;
 TabStop = TRUE ;
-Text [ x-comment ] = " ";
 };
-Text [ x-comment ] = " ";
 };
diff --git a/cui/source/options/optchart.src b/cui/source/options/optchart.src
index 425fbcf..7c95d04 100644
--- a/cui/source/options/optchart.src
+++ b/cui/source/options/optchart.src
@@ -42,7 +42,6 @@ TabPage RID_OPTPAGE_CHART_DEFCOLORS
 Pos = MAP_APPFONT ( 6 , 3  ) ;
 Size= MAP_APPFONT ( 80 , 8 ) ;
 Text [ en-US ] = "Chart colors";
-Text [ x-comment ] = " ";
 };
 ListBox LB_CHART_COLOR_LIST
 {
@@ -58,7 +57,6 @@ TabPage RID_OPTPAGE_CHART_DEFCOLORS
 Pos = MAP_APPFONT ( 92 , 3  ) ;
 Size= MAP_APPFONT ( 106 , 8 ) ;
 Text [ en-US ]  = "Color table" ;
-Text [ x-comment ] = " ";
 };
 Control CT_COLOR_BOX
 {
@@ -72,14 +70,12 @@ TabPage RID_OPTPAGE_CHART_DEFCOLORS
 Pos = MAP_APPFONT ( 204 , 15 ) ;
 Size = MAP_APPFONT ( 50 , 14 ) ;
 Text [ en-US ] = "~Add";
-Text [ x-comment ] = " ";
 };
 PushButton PB_REMOVE_CHART_COLOR
 {
 Pos = MAP_APPFONT ( 204 , 32 ) ;
 Size = MAP_APPFONT ( 50 , 14 ) ;
 Text [ en-US ] = "~Remove";
-Text [ x-comment ] = " ";
 };
 PushButton PB_RESET_TO_DEFAULT
 {
@@ -87,7 +83,6 @@ TabPage RID_OPTPAGE_CHART_DEFCOLORS
 Pos = MAP_APPFONT ( 204 , 165 ) ;
 Size = MAP_APPFONT ( 50 , 14 ) ;
 Text [ en-US ] = "~Default";
-Text [ x-comment ] = " ";
 };
 };
 
diff --git a/dbaccess/source/ui/inc/toolbox_tmpl.hrc 
b/dbaccess/source/ui/inc/toolbox_tmpl.hrc
index dfd035d..524646b 100644
--- a/dbaccess/source/ui/inc/toolbox_tmpl.hrc
+++ b/dbaccess/source/ui/inc/toolbox_tmpl.hrc
@@ -33,7 +33,6 @@
 #define MID_SBA_QRY_REFRESH \
 Identifier = ID_BROWSER_REFRESH ; \
 Text [ en-US ] = "Refresh"; \
-Text [ x-comment ] = " ";   \
 
 
 #define MID_NEW_VIEW_DESIGN \
diff --git a/framework/source/classes/resource.src 
b/framework/source/classes/resource.src
index c1af6eb..2a9bf0d 100644
--- a/framework/source/classes/resource.src
+++ b/framework/source/classes/resource.src
@@ -320,41 +320,34 @@ String STR_UNTITLED_DOCUMENT
 String STR_LANGSTATUS_MULTIPLE_LANGUAGES
 {
 Text [ en-US ] = "Multiple Langu