[Libreoffice-commits] .: Branch 'libreoffice-3-5' - cui/source
cui/source/tabpages/tpline.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit 14d47f6f6ed9f9e682136cc72d6fe44a9e0c7d9e
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Mon Mar 26 16:26:32 2012 -0400
fdo#46942: Fix a regression caused by List removal.
3236c2c3af9355157c62f68fcbd429498f7f747b accidentally removed the gallery
item count which was used to differentiate the gallery symbols from
normal ones.
Signed-off-by: Stephan Bergmann sberg...@redhat.com
diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx
index 3a27eaa..abb5df3 100644
--- a/cui/source/tabpages/tpline.cxx
+++ b/cui/source/tabpages/tpline.cxx
@@ -1464,6 +1464,7 @@ IMPL_LINK( SvxLineTabPage, MenuCreateHdl_Impl, MenuButton
*, pButton )
String aEmptyStr;
const String *pUIName = NULL;
sal_uInt32 i = 0;
+nNumMenuGalleryItems = aGrfNames.size();
for(std::vectorString::iterator it = aGrfNames.begin(); it !=
aGrfNames.end(); ++it, ++i)
{
pUIName = (*it);
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - cui/source
cui/source/tabpages/autocdlg.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 3a90b7fea7de8860dfdb92925df39dac3d0ed4fc
Author: Szabolcs Dezsi dezsisz...@hotmail.com
Date: Fri Feb 24 16:42:35 2012 +0100
Reduced loadtime of autocorrect tables
Signed-off-by: Andras Timar ati...@suse.com
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index 147a18f..764203a 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -1225,7 +1225,7 @@ void OfaAutocorrReplacePage::RefillReplaceBox(sal_Bool
bFromReset,
{
SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect();
SvxAutocorrWordList* pWordList =
pAutoCorrect-LoadAutocorrWordList(eLang);
-
+aReplaceTLB.SetUpdateMode(sal_False);
for(sal_uInt16 i = 0; i pWordList-Count(); i++)
{
SvxAutocorrWordPtr pWordPtr = pWordList-GetObject(i);
@@ -1248,7 +1248,7 @@ void OfaAutocorrReplacePage::RefillReplaceBox(sal_Bool
bFromReset,
}
aNewReplacePB.Enable(sal_False);
aDeleteReplacePB.Enable(sal_False);
-
+aReplaceTLB.SetUpdateMode(sal_True);
}
SfxViewShell* pViewShell = SfxViewShell::Current();
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - cui/source
cui/source/dialogs/SpellDialog.cxx | 175 ++---
1 file changed, 86 insertions(+), 89 deletions(-)
New commits:
commit c2c65d4f30cddb0528e8e9ef24e3d42a68ada25c
Author: Cédric Bosdonnat cedric.bosdonnat@free.fr
Date: Mon Feb 27 17:00:40 2012 +0100
fdo#46531: Fixed SpellCheck dialog display issues
More robust, handling of the explanations message and link display.
Signed-off-by: Michael Meeks michael.me...@suse.com
diff --git a/cui/source/dialogs/SpellDialog.cxx
b/cui/source/dialogs/SpellDialog.cxx
index cb68f6b..feb6a7e 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -403,6 +403,92 @@ void SpellDialog::UpdateBoxes_Impl()
aIgnoreRulePB.Enable(pSpellErrorDescription
pSpellErrorDescription-sRuleId.getLength());
aAutoCorrPB.Show( bShowChangeAll rParent.HasAutoCorrection() );
+bool bHasGrammarChecking = rParent.HasGrammarChecking();
+aCheckGrammarCB.Show( bHasGrammarChecking );
+if( !bHasGrammarChecking )
+{
+//resize the dialog to hide the hidden area of the CheckBox
+Size aBackSize = aBackgroundGB.GetSizePixel();
+sal_Int32 nDiff = aBackgroundGB.GetPosPixel().Y() + aBackSize.Height()
+- aCheckGrammarCB.GetPosPixel().Y();
+aBackSize.Height() -= nDiff;
+aBackgroundGB.SetSizePixel(aBackSize);
+Button* aButtons[] = { aHelpPB, aOptionsPB, aUndoPB, aClosePB, 0 };
+sal_Int32 nButton = 0;
+while( aButtons[nButton])
+{
+Point aPos = aButtons[nButton]-GetPosPixel();
+aPos.Y() -= nDiff;
+aButtons[nButton]-SetPosPixel(aPos);
+++nButton;
+}
+Size aDlgSize = GetSizePixel();
+aDlgSize.Height() -= nDiff;
+SetSizePixel( aDlgSize );
+}
+else
+{
+bool bHasExplainLink = aExplainLink.GetURL().Len() != 0;
+aExplainLink.Show( bHasExplainLink );
+
+sal_Int32 nExplainWidth = aExplainLink.GetPosPixel().X() -
aExplainFT.GetPosPixel().X();
+if ( !bHasExplainLink )
+nExplainWidth += aExplainLink.GetSizePixel().Width();
+sal_Int32 nExplainHeight = aExplainFT.GetActualHeight();
+sal_Int32 nCurrentHeight = aExplainFT.GetSizePixel().Height();
+if( aExplainFT.GetText().Len() == 0 )
+{
+nExplainHeight = 0;
+aExplainFT.Hide();
+aExplainLink.Hide();
+}
+
+Size aCtlSize = aExplainFT.GetSizePixel();
+aCtlSize.Height() = nExplainHeight;
+aCtlSize.Width() = nExplainWidth;
+aExplainFT.SetSizePixel( aCtlSize );
+
+aCtlSize = aExplainLink.GetSizePixel();
+aCtlSize.Height() = nExplainHeight;
+aExplainLink.SetSizePixel( aCtlSize );
+
+sal_Int32 nDiff = - ( nCurrentHeight - nExplainHeight );
+if ( nDiff != 0 )
+{
+Control* aControls[] = {
+aNotInDictFT,
+aSentenceED,
+aSuggestionFT,
+aSuggestionLB,
+aIgnorePB,
+aIgnoreAllPB,
+aIgnoreRulePB,
+aAddToDictMB,
+aChangePB,
+aChangeAllPB,
+aAutoCorrPB,
+aCheckGrammarCB,
+aHelpPB,
+aOptionsPB,
+aUndoPB,
+aClosePB,
+aBackgroundGB,
+0
+};
+sal_Int32 nControl = 0;
+while( aControls[nControl])
+{
+Point aPos = aControls[nControl]-GetPosPixel();
+aPos.Y() += nDiff;
+aControls[nControl]-SetPosPixel(aPos);
+++nControl;
+}
+Size aDlgSize = GetSizePixel();
+aDlgSize.Height() += nDiff;
+SetSizePixel( aDlgSize );
+Invalidate();
+}
+}
}
// ---
@@ -469,95 +555,6 @@ IMPL_STATIC_LINK( SpellDialog, InitHdl, SpellDialog *,
EMPTYARG )
pThis-aClosePB.GrabFocus();
pThis-LockFocusChanges(false);
//show grammar CheckBox depending on the modules abilities
-bool bHasGrammarChecking = pThis-rParent.HasGrammarChecking();
-pThis-aCheckGrammarCB.Show( bHasGrammarChecking );
-if( !bHasGrammarChecking )
-{
-//resize the dialog to hide the hidden area of the CheckBox
-Size aBackSize = pThis-aBackgroundGB.GetSizePixel();
-sal_Int32 nDiff = pThis-aBackgroundGB.GetPosPixel().Y() +
aBackSize.Height()
-- pThis-aCheckGrammarCB.GetPosPixel().Y();
-aBackSize.Height() -= nDiff;
-pThis-aBackgroundGB.SetSizePixel(aBackSize);
-Button* aButtons[] = { pThis-aHelpPB, pThis-aOptionsPB,
pThis-aUndoPB, pThis-aClosePB, 0 };
-sal_Int32 nButton = 0;
-while(
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - cui/source
cui/source/options/optgdlg.hrc |3 +--
cui/source/options/optgdlg.src |4 ++--
cui/source/options/optsave.src |4 ++--
3 files changed, 5 insertions(+), 6 deletions(-)
New commits:
commit 537169e64f34353dab8c6dcacc088fba61729392
Author: Ivan Timofeev timofeev@gmail.com
Date: Sun Feb 5 11:51:09 2012 +0400
fix various overlapped controls in the Options dialog
Signed-off-by: Andras Timar ati...@suse.com
diff --git a/cui/source/options/optgdlg.hrc b/cui/source/options/optgdlg.hrc
index 5e54e0b..d870e29 100644
--- a/cui/source/options/optgdlg.hrc
+++ b/cui/source/options/optgdlg.hrc
@@ -64,8 +64,7 @@
#define ROW11 (ROW10+RSC_CD_CHECKBOX_HEIGHT+ROWSPACE)
#define ROW12 (ROW11+RSC_CD_CHECKBOX_HEIGHT+ROWSPACE)
#define ROW13 (ROW12+RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE)
-#define ROW14 (ROW13+RSC_CD_CHECKBOX_HEIGHT+ROWSPACE)
-#define ROW15 (ROW14+RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE)
+#define ROW14 (ROW13+RSC_CD_CHECKBOX_HEIGHT+ROWSPACE+6)
#define DIFF(v1,v2) (v2-v1)
#define OFFS_TEXTBOX_FIXEDTEXT(base)
(base+(RSC_CD_TEXTBOX_HEIGHT-RSC_CD_FIXEDTEXT_HEIGHT)/2)
diff --git a/cui/source/options/optgdlg.src b/cui/source/options/optgdlg.src
index 730aa24..0e01fe0 100644
--- a/cui/source/options/optgdlg.src
+++ b/cui/source/options/optgdlg.src
@@ -188,7 +188,7 @@ TabPage OFA_TP_MISC
};
CheckBox CB_EXPERIMENTAL
{
-Pos = MAP_APPFONT( COL1, ROW15 );
+Pos = MAP_APPFONT( COL1, ROW14 );
Size = MAP_APPFONT( WHOLE_WIDTH - COL1, RSC_CD_CHECKBOX_HEIGHT );
Text [ en-US ] = Enable experimental (unstable) features;
};
@@ -456,7 +456,7 @@ TabPage OFA_TP_VIEW
{
HelpID = cui:CheckBox:OFA_TP_VIEW:CB_SELECTION;
Pos = MAP_APPFONT ( 139, ROW_CB_SELECTION + (((12 -
RSC_CD_CHECKBOX_HEIGHT) / 2) + 1)) ;
-Size = MAP_APPFONT ( 118 - 34 , RSC_CD_CHECKBOX_HEIGHT ) ;
+Size = MAP_APPFONT ( 83 , RSC_CD_CHECKBOX_HEIGHT ) ;
Text [ en-US ] = Transparency ;
};
diff --git a/cui/source/options/optsave.src b/cui/source/options/optsave.src
index da94bd4..845336f 100644
--- a/cui/source/options/optsave.src
+++ b/cui/source/options/optsave.src
@@ -101,7 +101,7 @@ TabPage RID_SFXPAGE_SAVE
{
HelpID = cui:NumericField:RID_SFXPAGE_SAVE:ED_AUTOSAVE;
Border = TRUE ;
-Pos = MAP_APPFONT ( 210 , 61 ) ;
+Pos = MAP_APPFONT ( 210 , 62 ) ;
Size = MAP_APPFONT ( 21 , 12 ) ;
Left = TRUE ;
Repeat = TRUE ;
@@ -116,7 +116,7 @@ TabPage RID_SFXPAGE_SAVE
};
FixedText FT_MINUTE
{
-Pos = MAP_APPFONT ( 234 , 63 ) ;
+Pos = MAP_APPFONT ( 234 , 64 ) ;
Size = MAP_APPFONT ( 35 , 8 ) ;
Text [ en-US ] = Minutes ;
};
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - cui/source
cui/source/dialogs/about.src |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit d4f161ed509071ee01798f3bf2d686826089
Author: Andras Timar ati...@suse.com
Date: Mon Jan 9 18:57:17 2012 +0100
bump LibreOffice copyright year to 2012
diff --git a/cui/source/dialogs/about.src b/cui/source/dialogs/about.src
index 8db6636..37e5f4d 100644
--- a/cui/source/dialogs/about.src
+++ b/cui/source/dialogs/about.src
@@ -78,11 +78,11 @@ ModalDialog RID_DEFAULTABOUT
};
String ABOUT_STR_COPYRIGHT
{
-Text[ en-US ] = LibreOffice is copyright © 2000, 2011 LibreOffice
contributors and/or their affiliates. All rights reserved.;
+Text[ en-US ] = LibreOffice is copyright © 2000, 2012 LibreOffice
contributors and/or their affiliates. All rights reserved.;
};
String ABOUT_STR_COPYRIGHT_DERIVED
{
-Text[ en-US ] = %PRODUCTNAME is derived from LibreOffice. LibreOffice
is copyright © 2000, 2011 LibreOffice contributors and/or their affiliates.
All rights reserved.;
+Text[ en-US ] = %PRODUCTNAME is derived from LibreOffice. LibreOffice
is copyright © 2000, 2012 LibreOffice contributors and/or their affiliates.
All rights reserved.;
};
String ABOUT_STR_COPYRIGHT_ORACLE_DERIVED
{
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - cui/source
cui/source/options/optdict.src |8
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 5907a4c1b8af1f73e966b4c1fe517dee0a3815f1
Author: Ivan Timofeev timofeev@gmail.com
Date: Sat Jan 7 09:29:29 2012 +0400
move overlapped controls
diff --git a/cui/source/options/optdict.src b/cui/source/options/optdict.src
index 31a8f9a..009aa34 100644
--- a/cui/source/options/optdict.src
+++ b/cui/source/options/optdict.src
@@ -122,8 +122,8 @@ ModalDialog RID_SFXDLG_EDITDICT
{
HelpID = cui:ListBox:RID_SFXDLG_EDITDICT:LB_ALLDICTS;
Border = TRUE ;
-Pos = MAP_APPFONT ( 82 , 9 ) ;
-Size = MAP_APPFONT ( 121 , 62 ) ;
+Pos = MAP_APPFONT ( 100 , 9 ) ;
+Size = MAP_APPFONT ( 103 , 62 ) ;
DropDown = TRUE ;
};
FixedText FT_DICTLANG
@@ -136,8 +136,8 @@ ModalDialog RID_SFXDLG_EDITDICT
{
HelpID = cui:ListBox:RID_SFXDLG_EDITDICT:LB_DICTLANG;
Border = TRUE ;
-Pos = MAP_APPFONT ( 82 , 25 ) ;
-Size = MAP_APPFONT ( 121 , 66 ) ;
+Pos = MAP_APPFONT ( 100 , 25 ) ;
+Size = MAP_APPFONT ( 103 , 66 ) ;
DropDown = TRUE ;
};
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - cui/source desktop/source
cui/source/tabpages/tabarea.src |8
cui/source/tabpages/textanim.src |2 +-
desktop/source/app/desktop.src |2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit daab19c2ae13245318b8fcd1a5468cae7ab43348
Author: Andras Timar ati...@suse.com
Date: Sat Jan 7 22:56:54 2012 +0100
yet another few strings to localize
diff --git a/cui/source/tabpages/tabarea.src b/cui/source/tabpages/tabarea.src
index a3e1e54..b1117b1 100644
--- a/cui/source/tabpages/tabarea.src
+++ b/cui/source/tabpages/tabarea.src
@@ -1309,7 +1309,7 @@ TabPage RID_SVXPAGE_COLOR
{
Pos = MAP_APPFONT ( 142 , 89 ) ;
Size = MAP_APPFONT ( 15 , 8 ) ;
-Text = ~C ;
+Text [ en-US ] = ~C ;
};
MetricField MTR_FLD_1
{
@@ -1329,7 +1329,7 @@ TabPage RID_SVXPAGE_COLOR
{
Pos = MAP_APPFONT ( 142 , 105 ) ;
Size = MAP_APPFONT ( 15 , 8 ) ;
-Text = ~M ;
+Text [ en-US ] = ~M ;
};
MetricField MTR_FLD_2
{
@@ -1349,7 +1349,7 @@ TabPage RID_SVXPAGE_COLOR
{
Pos = MAP_APPFONT ( 142 , 121 ) ;
Size = MAP_APPFONT ( 15 , 8 ) ;
-Text = ~Y ;
+Text [ en-US ] = ~Y ;
};
MetricField MTR_FLD_3
{
@@ -1369,7 +1369,7 @@ TabPage RID_SVXPAGE_COLOR
{
Pos = MAP_APPFONT ( 142 , 137 ) ;
Size = MAP_APPFONT ( 15 , 8 ) ;
-Text = ~K ;
+Text [ en-US ] = ~K ;
};
MetricField MTR_FLD_4
{
diff --git a/cui/source/tabpages/textanim.src b/cui/source/tabpages/textanim.src
index f015028..b330565 100644
--- a/cui/source/tabpages/textanim.src
+++ b/cui/source/tabpages/textanim.src
@@ -272,7 +272,7 @@ TabPage RID_SVXPAGE_TEXTANIMATION
Spinsize = 50 ;
StrictFormat = TRUE ;
Unit = FUNIT_CUSTOM ;
-CustomUnitText = ms ;
+CustomUnitText [ en-US ] = ms ;
Maximum = 3 ;
Last = 3 ;
};
diff --git a/desktop/source/app/desktop.src b/desktop/source/app/desktop.src
index 98ee686..0b6bc3f 100644
--- a/desktop/source/app/desktop.src
+++ b/desktop/source/app/desktop.src
@@ -160,7 +160,7 @@ InfoBox INFOBOX_CMDLINEHELP
ModalDialog DLG_CMDLINEHELP
{
HelpID = desktop:ModalDialog:DLG_CMDLINEHELP;
-Text = Help Message...;
+Text [ en-US ] = Help Message...;
Size = MAP_APPFONT(250, 365);
Border = True;
SVLook = True;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - cui/source dbaccess/source extensions/source sc/source sd/source svx/source sw/source
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 2650c803fa62bbf9d4138ead30de5ba3a2896856
Author: Lior Kaplan kaplanl...@gmail.com
Date: Mon Jan 2 22:35:33 2012 +0200
Clean non English strings in the code
we do translation differently.
(cherry picked from commit 14c0e038c9c33dc59cbf6e5ec81d36779f28b004)
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] .: Branch 'libreoffice-3-5' - cui/source
cui/source/options/treeopt.src |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d8be0409037279154d6ae619e04f97e45018326d Author: Lior Kaplan kaplanl...@gmail.com Date: Tue Dec 13 00:55:01 2011 +0200 fdo#39452: 'Back' is misleading, use 'Revert' instead diff --git a/cui/source/options/treeopt.src b/cui/source/options/treeopt.src index 62be8ce..1de1ca6 100644 --- a/cui/source/options/treeopt.src +++ b/cui/source/options/treeopt.src @@ -67,7 +67,7 @@ ModalDialog RID_OFADLG_OPTIONS_TREE Pos = MAP_APPFONT ( COL_10, ROW_3 ) ; Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ; TabStop = TRUE ; -Text [ en-US ] = ~Back ; +Text [ en-US ] = ~Revert ; }; //TreeListBox Control TLB_PAGES ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - cui/source i18npool/inc i18npool/source svtools/inc svtools/source
cui/source/options/optgdlg.cxx |4 ++--
i18npool/inc/i18npool/mslangid.hxx | 15 +--
i18npool/source/isolang/mslangid.cxx |5 +++--
svtools/inc/svtools/langtab.hxx |8 +++-
svtools/source/misc/langtab.cxx |4 ++--
svtools/source/misc/langtab.src |1 +
6 files changed, 28 insertions(+), 9 deletions(-)
New commits:
commit eea858f6c7696becab4e67ca00f5ee0293e63718
Author: Eike Rathke er...@redhat.com
Date: Fri Dec 9 22:33:50 2011 +0100
fixed fdo#37349 present Catalan (Valencian) as selectable UI language
Catalan (Valencian) has no ISO 639 code assigned and the UI localization
uses
the ca-XV hack where XV is of the reserved ISO 3166 user-assigned range.
This
should not escape to document content therefor internally a replacement to
ca-ES is done for all locale attribution. For the UI localization to be
distinguishable under Tools-Options-LanguageSettings-UserInterface this
needed a special handling to allow Catalan (Valencian) again.
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index dabc5a7..79c41d8 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -1280,7 +1280,7 @@ OfaLanguagesTabPage::OfaLanguagesTabPage( Window*
pParent, const SfxItemSet rSe
String aUILang(aStr);
aUILang += String::CreateFromAscii( - );
-aUILang += pLanguageTable-GetString(
Application::GetSettings().GetUILanguage() );
+aUILang += pLanguageTable-GetString(
Application::GetSettings().GetUILanguage(), true );
aUserInterfaceLB.InsertEntry(aUILang);
aUserInterfaceLB.SetEntryData(0, 0);
@@ -1308,7 +1308,7 @@ OfaLanguagesTabPage::OfaLanguagesTabPage( Window*
pParent, const SfxItemSet rSe
if (aLang != LANGUAGE_DONTKNOW)
{
//sal_uInt16 p = aUserInterfaceLB.InsertLanguage(aLang);
-String aLangStr( pLanguageTable-GetString( aLang ) );
+String aLangStr( pLanguageTable-GetString( aLang, true ) );
sal_uInt16 p = aUserInterfaceLB.InsertEntry(aLangStr);
aUserInterfaceLB.SetEntryData(p, (void*)(i+1));
}
diff --git a/i18npool/inc/i18npool/mslangid.hxx
b/i18npool/inc/i18npool/mslangid.hxx
index 717a5bb..f1da981 100644
--- a/i18npool/inc/i18npool/mslangid.hxx
+++ b/i18npool/inc/i18npool/mslangid.hxx
@@ -203,8 +203,19 @@ public:
/** Map an obsolete user defined LANGID (see lang.h
LANGUAGE_OBSOLETE_USER_...) to the new value defined by MS in the
-meantime. */
-static LanguageType getReplacementForObsoleteLanguage( LanguageType nLang
);
+meantime.
+
+Also used to map UI localizations using reserved ISO codes to something
+official but not identical in order to not pollute documents with
+invalid ISO codes.
+
+@param bUserInterfaceSelection
+If TRUE, don't replace such UI-only locale. Only use for
+ Tools-Options-LanguageSettings-UserInterface listbox.
+If FALSE, do replace.
+ */
+static LanguageType getReplacementForObsoleteLanguage( LanguageType nLang,
+bool bUserInterfaceSelection = false );
/** @ATTENTION: these are _ONLY_ to be called by the application's
diff --git a/i18npool/source/isolang/mslangid.cxx
b/i18npool/source/isolang/mslangid.cxx
index 06941b6..e5661da 100644
--- a/i18npool/source/isolang/mslangid.cxx
+++ b/i18npool/source/isolang/mslangid.cxx
@@ -379,7 +379,7 @@ sal_Int16 MsLangId::getScriptType( LanguageType nLang )
// static
-LanguageType MsLangId::getReplacementForObsoleteLanguage( LanguageType nLang )
+LanguageType MsLangId::getReplacementForObsoleteLanguage( LanguageType nLang,
bool bUserInterfaceSelection )
{
switch (nLang)
{
@@ -433,7 +433,8 @@ LanguageType MsLangId::getReplacementForObsoleteLanguage(
LanguageType nLang )
// Do not use ca-XV for document content.
/* TODO: remove in case we implement BCP47 language tags. */
case LANGUAGE_USER_CATALAN_VALENCIAN:
-nLang = LANGUAGE_CATALAN;
+if (!bUserInterfaceSelection)
+nLang = LANGUAGE_CATALAN;
break;
}
return nLang;
diff --git a/svtools/inc/svtools/langtab.hxx b/svtools/inc/svtools/langtab.hxx
index 9b38297..5785322 100644
--- a/svtools/inc/svtools/langtab.hxx
+++ b/svtools/inc/svtools/langtab.hxx
@@ -43,7 +43,13 @@ public:
SvtLanguageTable();
~SvtLanguageTable();
-const String GetString( const LanguageType eType ) const;
+/**
+@param bUserInterfaceSelection
+If TRUE, don't replace an UI-only locale. Only use for
+ Tools-Options-LanguageSettings-UserInterface listbox.
+If FALSE, do replace.
+ */
+const String GetString( const LanguageType eType, bool
bUserInterfaceSelection = false ) const;
LanguageTypeGetType( const String
