From 28c96fc2553a5c3dee108f1e2060d7bc081a7e7e Mon Sep 17 00:00:00 2001 From: Chris Sherlock Date: Sun, 17 Jan 2016 13:26:25 +1100 Subject: vcl: rename Font::GetName to Font::GetFamilyName Change-Id: Ie20871a3078bf875c1782b7761d60591a9c9704f Reviewed-on: https://gerrit.libreoffice.org/21529 Tested-by: Jenkins Reviewed-by: Chris Sherlock --- forms/source/richtext/richtextengine.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'forms') diff --git a/forms/source/richtext/richtextengine.cxx b/forms/source/richtext/richtextengine.cxx index ede2b4dccb9e..8043d0079536 100644 --- a/forms/source/richtext/richtextengine.cxx +++ b/forms/source/richtext/richtextengine.cxx @@ -63,7 +63,7 @@ namespace frm // defaults vcl::Font aFont = Application::GetSettings().GetStyleSettings().GetAppFont(); aFont.SetName( "Times New Roman" ); - pPool->SetPoolDefaultItem( SvxFontItem( aFont.GetFamily(), aFont.GetName(), OUString(), aFont.GetPitch(), aFont.GetCharSet(), EE_CHAR_FONTINFO ) ); + pPool->SetPoolDefaultItem( SvxFontItem( aFont.GetFamily(), aFont.GetFamilyName(), OUString(), aFont.GetPitch(), aFont.GetCharSet(), EE_CHAR_FONTINFO ) ); // 12 pt font size MapMode aPointMapMode( MAP_POINT ); -- cgit shed> 5c151537b571614c8f10b96e2b60faa959413f1f Change-Id: Ib6888045cecb4bd7b3498534605d790324f1b40a Reviewed-on: https://gerrit.libreoffice.org/43265 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> 
Change-Id: Ib6888045cecb4bd7b3498534605d790324f1b40a
Reviewed-on: https://gerrit.libreoffice.org/43265
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
loplugin:staticmethods: sw 2016-10-07T10:07:43+00:00 Stephan Bergmann sbergman@redhat.com 2016-10-07T09:58:44+00:00 f1cb6a031e5ba3fbdfb722175d82f48ee1e6067f Change-Id: I2b06eb926ebc8ab04883da3272ea239a12e09436 
Change-Id: I2b06eb926ebc8ab04883da3272ea239a12e09436
loplugin:override: No more need for the "MSVC dtor override" workaround 2016-09-13T11:19:22+00:00 Stephan Bergmann sbergman@redhat.com 2016-09-13T11:09:01+00:00 91dd2db17bd6cb9b357d1d69b187174e31eabef0 The issue of 362d4f0cd4e50111edfae9d30c90602c37ed65a2 "Explicitly mark overriding destructors as 'virtual'" appears to no longer be a problem with MSVC 2013. (The little change in the rewriting code of compilerplugins/clang/override.cxx was necessary to prevent an endless loop when adding "override" to OOO_DLLPUBLIC_CHARTTOOLS virtual ~CloseableLifeTimeManager(); in chart2/source/inc/LifeTime.hxx, getting stuck in the leading OOO_DLLPUBLIC_CHARTTOOLS macro. Can't remember what that isAtEndOfImmediateMacroExpansion thing was originally necessary for, anyway.) Change-Id: I534c634504d7216b9bb632c2775c04eaf27e927e 
The issue of 362d4f0cd4e50111edfae9d30c90602c37ed65a2 "Explicitly mark
overriding destructors as 'virtual'" appears to no longer be a problem with
MSVC 2013.

(The little change in the rewriting code of compilerplugins/clang/override.cxx
was necessary to prevent an endless loop when adding "override" to

  OOO_DLLPUBLIC_CHARTTOOLS    virtual ~CloseableLifeTimeManager();

in chart2/source/inc/LifeTime.hxx, getting stuck in the leading
OOO_DLLPUBLIC_CHARTTOOLS macro.  Can't remember what that
isAtEndOfImmediateMacroExpansion thing was originally necessary for, anyway.)

Change-Id: I534c634504d7216b9bb632c2775c04eaf27e927e
com::sun::star->css in sw/source/core 2015-11-06T09:55:09+00:00 Noel Grandin noel@peralex.com 2015-11-06T08:51:51+00:00 2633976ef3406d48907bd922f067ea04e39c94f1 Change-Id: I30016977f1be8fb53dd239367d043de92a9467d9 
Change-Id: I30016977f1be8fb53dd239367d043de92a9467d9
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code 2015-10-12T15:52:29+00:00 Stephan Bergmann sbergman@redhat.com 2015-10-12T14:04:04+00:00 b36963c0a6a09f70ca6d8d607dd3249a3496497d Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274 
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
utl::ConfigItem::Commit() should call ClearModified() 2015-03-11T15:50:00+00:00 Michael Stahl mstahl@redhat.com 2015-03-11T15:14:47+00:00 765f6211b1371c1e40de386e715de6b3d1a8df86 Rename the virtual function, and add a new non-virtual Commit() to do that. Change-Id: I09421df781ba965d6ff638b46cd8214fb3a00022 
Rename the virtual function, and add a new non-virtual Commit() to do
that.

Change-Id: I09421df781ba965d6ff638b46cd8214fb3a00022
sw: fix include guards 2014-06-03T09:17:22+00:00 Thomas Arnhold thomas@arnhold.org 2014-06-03T08:01:18+00:00 cebb96ec3a22d9023fb8a8d91f6c766a8a3866af after the latest file move Change-Id: I105eb04ad98d1bf71eddec4528657c248fcc4348 
after the latest file move

Change-Id: I105eb04ad98d1bf71eddec4528657c248fcc4348
sw: move sw/source/core/uibase to sw/source/uibase 2014-05-27T09:13:02+00:00 Michael Stahl mstahl@redhat.com 2014-05-26T15:43:14+00:00 35029b250318b3a4f02cef5194abdd3f68311c43 It's too confusing to have UI code inside of core; the important part is that it's separated from the optional UI code in swui library. Change-Id: I640a52723d5802faf08f3b8eaa03cd937fd93449 
It's too confusing to have UI code inside of core; the important part is
that it's separated from the optional UI code in swui library.

Change-Id: I640a52723d5802faf08f3b8eaa03cd937fd93449