[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0' - 4 commits - .gitignore svx/inc svx/source
Stephan Bergmann
sbergman at redhat.com
Tue Apr 2 06:46:18 PDT 2013
.gitignore | 1
svx/inc/svx/dialogs.hrc | 2 +
svx/source/tbxctrls/tbcontrl.cxx | 43 +++++++++++++++++++++++++++++++++++++++
svx/source/tbxctrls/tbcontrl.src | 10 +++++++++
4 files changed, 56 insertions(+)
New commits:
commit aa328d8c14e33025a52ccffd736436e8a11ef287
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Apr 2 15:30:43 2013 +0200
.gitignore config/config_version.h (generated)
diff --git a/.gitignore b/.gitignore
index ddb84f7..9aef00e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -54,6 +54,7 @@
/config.log
/config.status
/config.parms
+/config/config_version.h
/config_host.mk
/config_host.mk.last
/config_host.mk.stamp
commit 3ac6b7d18ccd5284feed339540ea5dad452e2d5a
Author: Luboš Luňák <l.lunak at suse.cz>
Date: Fri Feb 8 14:44:41 2013 +0100
try to reuse a string so that at least part of a message is translated
Change-Id: Ie452223b1b55b50e851f666b340355a4d116b84f
diff --git a/svx/inc/svx/dialogs.hrc b/svx/inc/svx/dialogs.hrc
index bb5a13d..9974054 100644
--- a/svx/inc/svx/dialogs.hrc
+++ b/svx/inc/svx/dialogs.hrc
@@ -279,7 +279,7 @@
#define RID_SVXSTR_EXTRAS_CHARBACKGROUND (RID_SVX_START + 196)
#define RID_SVXSTR_CLEARFORM (RID_SVX_START + 197)
#define RID_SVXSTR_MORE (RID_SVX_START + 198)
-#define RID_SVXSTR_CHARFONTNAME_NOTAVAILABLE (RID_SVX_START + 199)
+#define RID_SVXSTR_CHARFONTNAME_NOTAVAILABLE_APPEND (RID_SVX_START + 199)
#define RID_SVXSTR_CHARFONTNAME (RID_SVX_START + 200)
// Strings for insert/overwrite mode
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 0e1a55d..ba1937e 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -839,7 +839,8 @@ void SvxFontNameBox_Impl::CheckAndMarkUnknownFont( const XubString& fontname )
{
font.SetItalic( ITALIC_NORMAL );
SetControlFont( font );
- SetQuickHelpText( SVX_RESSTR( RID_SVXSTR_CHARFONTNAME_NOTAVAILABLE ));
+ SetQuickHelpText( SVX_RESSTR( RID_SVXSTR_CHARFONTNAME )
+ + ". " + SVX_RESSTR( RID_SVXSTR_CHARFONTNAME_NOTAVAILABLE_APPEND ));
}
}
}
diff --git a/svx/source/tbxctrls/tbcontrl.src b/svx/source/tbxctrls/tbcontrl.src
index 7c19bd7..b5c5ee9 100644
--- a/svx/source/tbxctrls/tbcontrl.src
+++ b/svx/source/tbxctrls/tbcontrl.src
@@ -160,7 +160,7 @@ String RID_SVXSTR_CHARFONTNAME
Text [ en-US ] = "Font Name";
};
-String RID_SVXSTR_CHARFONTNAME_NOTAVAILABLE
+String RID_SVXSTR_CHARFONTNAME_NOTAVAILABLE_APPEND
{
- Text [ en-US ] = "Font Name. The current font is not available and will be substituted.";
+ Text [ en-US ] = "The current font is not available and will be substituted.";
};
commit ce231a9f2c8119215ea1a56515f7e1d0243c9b40
Author: Luboš Luňák <l.lunak at suse.cz>
Date: Wed Feb 6 18:31:14 2013 +0100
also change the font combo tooltip to say font is not available (fate#308255)
(cherry picked from commit 17d86df23e7be3ab0a161f69ff0f703728e0e135)
Conflicts:
svx/source/tbxctrls/tbcontrl.src
Change-Id: I68e31498aa4916e11e04c57171e32cf9b3204108
diff --git a/svx/inc/svx/dialogs.hrc b/svx/inc/svx/dialogs.hrc
index 7141065..bb5a13d 100644
--- a/svx/inc/svx/dialogs.hrc
+++ b/svx/inc/svx/dialogs.hrc
@@ -279,6 +279,8 @@
#define RID_SVXSTR_EXTRAS_CHARBACKGROUND (RID_SVX_START + 196)
#define RID_SVXSTR_CLEARFORM (RID_SVX_START + 197)
#define RID_SVXSTR_MORE (RID_SVX_START + 198)
+#define RID_SVXSTR_CHARFONTNAME_NOTAVAILABLE (RID_SVX_START + 199)
+#define RID_SVXSTR_CHARFONTNAME (RID_SVX_START + 200)
// Strings for insert/overwrite mode
#define RID_SVXSTR_INSERT_HELPTEXT (RID_SVX_START + 210)
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index e066a14..0e1a55d 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -830,6 +830,7 @@ void SvxFontNameBox_Impl::CheckAndMarkUnknownFont( const XubString& fontname )
{
font.SetItalic( ITALIC_NONE );
SetControlFont( font );
+ SetQuickHelpText( SVX_RESSTR( RID_SVXSTR_CHARFONTNAME ));
}
}
else
@@ -838,6 +839,7 @@ void SvxFontNameBox_Impl::CheckAndMarkUnknownFont( const XubString& fontname )
{
font.SetItalic( ITALIC_NORMAL );
SetControlFont( font );
+ SetQuickHelpText( SVX_RESSTR( RID_SVXSTR_CHARFONTNAME_NOTAVAILABLE ));
}
}
}
diff --git a/svx/source/tbxctrls/tbcontrl.src b/svx/source/tbxctrls/tbcontrl.src
index 678fec5..7c19bd7 100644
--- a/svx/source/tbxctrls/tbcontrl.src
+++ b/svx/source/tbxctrls/tbcontrl.src
@@ -154,3 +154,13 @@ String RID_SVXSTR_TEXTCOLOR
};
// ********************************************************************** EOF
+// This is duplicated in GenericCommands.xcu in officecfg.
+String RID_SVXSTR_CHARFONTNAME
+{
+ Text [ en-US ] = "Font Name";
+};
+
+String RID_SVXSTR_CHARFONTNAME_NOTAVAILABLE
+{
+ Text [ en-US ] = "Font Name. The current font is not available and will be substituted.";
+};
commit f1470c8a58b6954c95c473b1072840415d52ccc9
Author: Luboš Luňák <l.lunak at suse.cz>
Date: Tue Feb 5 16:40:29 2013 +0100
if a font is not available, show its name in italic in font combo(fate#308255)
(cherry picked from commit 0376a4c13ccffa64c938c6361a337264ad8f2b67)
Conflicts:
vcl/inc/vcl/combobox.hxx
Change-Id: Ia7d0de2c3017f450b9ace31753a351601ca6f1f0
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 112ef1f..e066a14 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -191,6 +191,7 @@ private:
void ReleaseFocus_Impl();
void EnableControls_Impl();
+ void CheckAndMarkUnknownFont( const XubString& fontname );
protected:
virtual void Select();
@@ -208,6 +209,8 @@ public:
void Fill( const FontList* pList )
{ FontNameBox::Fill( pList );
nFtCount = pList->GetFontNameCount(); }
+ virtual void SetText( const XubString& rStr );
+ virtual void SetText( const XubString& rStr, const Selection& rNewSelection );
virtual long PreNotify( NotifyEvent& rNEvt );
virtual long Notify( NotifyEvent& rNEvt );
virtual Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible();
@@ -802,6 +805,43 @@ void SvxFontNameBox_Impl::FillList()
SetSelection( aOldSel );
}
+void SvxFontNameBox_Impl::SetText( const XubString& rStr )
+{
+ CheckAndMarkUnknownFont( rStr );
+ return FontNameBox::SetText( rStr );
+}
+
+void SvxFontNameBox_Impl::SetText( const XubString& rStr, const Selection& rNewSelection )
+{
+ CheckAndMarkUnknownFont( rStr );
+ return FontNameBox::SetText( rStr, rNewSelection );
+}
+
+void SvxFontNameBox_Impl::CheckAndMarkUnknownFont( const XubString& fontname )
+{
+ if( fontname == GetText())
+ return;
+ GetDocFontList_Impl( &pFontList, this );
+ // If the font is unknown, show it in italic.
+ Font font = GetControlFont();
+ if( pFontList != NULL && pFontList->IsAvailable( fontname ))
+ {
+ if( font.GetItalic() != ITALIC_NONE )
+ {
+ font.SetItalic( ITALIC_NONE );
+ SetControlFont( font );
+ }
+ }
+ else
+ {
+ if( font.GetItalic() != ITALIC_NORMAL )
+ {
+ font.SetItalic( ITALIC_NORMAL );
+ SetControlFont( font );
+ }
+ }
+}
+
// -----------------------------------------------------------------------
void SvxFontNameBox_Impl::Update( const SvxFontItem* pFontItem )
More information about the Libreoffice-commits
mailing list