summaryrefslogtreecommitdiff
path: root/psprint
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2008-10-01 13:31:44 +0000
committerVladimir Glazounov <vg@openoffice.org>2008-10-01 13:31:44 +0000
commit46a63a2af38e694327c5308168f499a549fb724e (patch)
tree6e80cfea121ed9231141a56153e9208f553863cb /psprint
parent248539e2fa8ac0f5271a83f26fe71d0dcc4a5a67 (diff)
CWS-TOOLING: integrate CWS vcl92
Diffstat (limited to 'psprint')
-rw-r--r--psprint/inc/psprint/printergfx.hxx3
-rw-r--r--psprint/source/fontsubset/gsub.cxx10
-rw-r--r--psprint/source/fontsubset/gsub.h4
-rw-r--r--psprint/source/fontsubset/sft.c5
-rw-r--r--psprint/source/printergfx/common_gfx.cxx9
5 files changed, 17 insertions, 14 deletions
diff --git a/psprint/inc/psprint/printergfx.hxx b/psprint/inc/psprint/printergfx.hxx
index 4b26051f212c..30c141fb1a88 100644
--- a/psprint/inc/psprint/printergfx.hxx
+++ b/psprint/inc/psprint/printergfx.hxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: printergfx.hxx,v $
- * $Revision: 1.19 $
+ * $Revision: 1.19.18.1 $
*
* This file is part of OpenOffice.org.
*
@@ -339,7 +339,6 @@ public:
// query depth and size
void GetResolution (sal_Int32 &rDpiX, sal_Int32 &rDpiY) const;
- void GetScreenFontResolution (sal_Int32 &rDpiX, sal_Int32 &rDpiY) const;
sal_uInt16 GetBitCount ();
// clip region
diff --git a/psprint/source/fontsubset/gsub.cxx b/psprint/source/fontsubset/gsub.cxx
index df3efd23e2f2..f49eb54c575a 100644
--- a/psprint/source/fontsubset/gsub.cxx
+++ b/psprint/source/fontsubset/gsub.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: gsub.cxx,v $
- * $Revision: 1.12 $
+ * $Revision: 1.12.18.1 $
*
* This file is part of OpenOffice.org.
*
@@ -322,10 +322,16 @@ int ReadGSUB( struct _TrueTypeFont* pTTFile,
}
}
}
-
return true;
}
+void ReleaseGSUB(struct _TrueTypeFont* pTTFile)
+{
+ GlyphSubstitution* pGlyphSubstitution = (GlyphSubstitution*)pTTFile->pGSubstitution;
+ if( pGlyphSubstitution )
+ delete pGlyphSubstitution;
+}
+
int UseGSUB( struct _TrueTypeFont* pTTFile, int nGlyph, int /*wmode*/ )
{
GlyphSubstitution* pGlyphSubstitution = (GlyphSubstitution*)pTTFile->pGSubstitution;
diff --git a/psprint/source/fontsubset/gsub.h b/psprint/source/fontsubset/gsub.h
index bfd25abca6b3..c64b2abb7e00 100644
--- a/psprint/source/fontsubset/gsub.h
+++ b/psprint/source/fontsubset/gsub.h
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: gsub.h,v $
- * $Revision: 1.6 $
+ * $Revision: 1.6.18.1 $
*
* This file is part of OpenOffice.org.
*
@@ -41,6 +41,8 @@ int UseGSUB( struct _TrueTypeFont* pTTFile, int nGlyph, int wmode );
int ReadGSUB( struct _TrueTypeFont* pTTFile, int nRequestedScript, int nRequestedLangsys );
+void ReleaseGSUB( struct _TrueTypeFont* pTTFile );
+
#ifdef __cplusplus
}
#endif
diff --git a/psprint/source/fontsubset/sft.c b/psprint/source/fontsubset/sft.c
index 49dce7043388..cc63a7f3a897 100644
--- a/psprint/source/fontsubset/sft.c
+++ b/psprint/source/fontsubset/sft.c
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: sft.c,v $
- * $Revision: 1.47 $
+ * $Revision: 1.47.4.1 $
*
* This file is part of OpenOffice.org.
*
@@ -1925,6 +1925,9 @@ void CloseTTFont(TrueTypeFont *ttf) /*FOLD01*/
free(ttf->tables);
free(ttf->tlens);
free(ttf->kerntables);
+
+ ReleaseGSUB(ttf);
+
free(ttf);
return;
}
diff --git a/psprint/source/printergfx/common_gfx.cxx b/psprint/source/printergfx/common_gfx.cxx
index 7cb6ae33d0aa..70342de05222 100644
--- a/psprint/source/printergfx/common_gfx.cxx
+++ b/psprint/source/printergfx/common_gfx.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: common_gfx.cxx,v $
- * $Revision: 1.20 $
+ * $Revision: 1.20.18.1 $
*
* This file is part of OpenOffice.org.
*
@@ -115,13 +115,6 @@ PrinterGfx::GetResolution (sal_Int32 &rDpiX, sal_Int32 &rDpiY) const
rDpiY = mnDpi;
}
-void
-PrinterGfx::GetScreenFontResolution (sal_Int32 &rDpiX, sal_Int32 &rDpiY) const
-{
- rDpiX = mnDpi;
- rDpiY = mnDpi;
-}
-
sal_uInt16
PrinterGfx::GetBitCount ()
{