starmath/inc/format.hxx | 9 ---------
starmath/source/format.cxx | 5 +----
2 files changed, 1 insertion(+), 13 deletions(-)
New commits:
commit 42c5c699d131d34bdb3dba2545438337c9c1bb09
Author: Takeshi Abe <t...@fixedpoint.jp>
Date: Thu Feb 25 17:27:05 2016 +0900
starmath: Remove forgotten SmFormat's version
Its last usage was gone with 26bdb10a52f441b4026d651ec50189b88391319e.
Change-Id: I3a58a5596eaa930e9d7034b87fe05cbe8a902c41
Reviewed-on: https://gerrit.libreoffice.org/22690
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: David Tardon <dtar...@redhat.com>
diff --git a/starmath/inc/format.hxx b/starmath/inc/format.hxx
index af1b24a..05a294d 100644
--- a/starmath/inc/format.hxx
+++ b/starmath/inc/format.hxx
@@ -26,9 +26,6 @@
#include <types.hxx>
-#define SM_FMT_VERSION_51 (sal_uInt8(0x01))
-#define SM_FMT_VERSION_NOW SM_FMT_VERSION_51
-
#define FNTNAME_TIMES "Times New Roman"
#define FNTNAME_HELV "Helvetica"
#define FNTNAME_COUR "Courier"
@@ -97,7 +94,6 @@ class SmFormat : public SfxBroadcaster
SmFace vFont[FNT_END + 1];
bool bDefaultFont[FNT_END + 1];
Size aBaseSize;
- long nVersion;
sal_uInt16 vSize[SIZ_END + 1];
sal_uInt16 vDist[DIS_END + 1];
SmHorAlign eHorAlign;
@@ -137,11 +133,6 @@ public:
bool IsScaleNormalBrackets() const { return
bScaleNormalBrackets; }
void SetScaleNormalBrackets(bool bVal) { bScaleNormalBrackets =
bVal; }
- long GetVersion() const { return nVersion; }
-
- //! at time (5.1) use only the lower byte!!!
- void SetVersion(long nVer) { nVersion = nVer; }
-
SmFormat & operator = (const SmFormat &rFormat);
bool operator == (const SmFormat &rFormat) const;
diff --git a/starmath/source/format.cxx b/starmath/source/format.cxx
index 0291736..b4b9793 100644
--- a/starmath/source/format.cxx
+++ b/starmath/source/format.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <tools/stream.hxx>
+#include <svl/languageoptions.hxx>
#include <vcl/svapp.hxx>
#include <editeng/scripttypeitem.hxx>
#include "format.hxx"
@@ -96,8 +96,6 @@ OUString GetDefaultFontName( LanguageType nLang, sal_uInt16
nIdent )
SmFormat::SmFormat()
: aBaseSize(0, SmPtsTo100th_mm(12))
{
- nVersion = SM_FMT_VERSION_NOW;
-
eHorAlign = AlignCenter;
nGreekCharStyle = 0;
bIsTextmode = bScaleNormalBrackets = false;
@@ -175,7 +173,6 @@ void SmFormat::SetFont(sal_uInt16 nIdent, const SmFace
&rFont, bool bDefault )
SmFormat & SmFormat::operator = (const SmFormat &rFormat)
{
SetBaseSize(rFormat.GetBaseSize());
- SetVersion (rFormat.GetVersion());
SetHorAlign(rFormat.GetHorAlign());
SetTextmode(rFormat.IsTextmode());
SetGreekCharStyle(rFormat.GetGreekCharStyle());
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
