summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2019-03-04 08:56:11 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2019-03-04 08:56:11 +0200
commitc9bb48386bad7d2a40e6958883328145ae439cad (patch)
tree8576ed314b2d219fdd96b8c1990f16fb70847a54 /vcl
parent9865440d217d975206a3f91612f0666312bc8fd8 (diff)
Revert "new loplugin typedefparam"
This reverts commit 9865440d217d975206a3f91612f0666312bc8fd8. This is not ready to land yet, seems like the latest update of the logic reveals a bunch more places I need to fix before it can land.
Diffstat (limited to 'vcl')
-rw-r--r--vcl/inc/unx/cpdmgr.hxx4
-rw-r--r--vcl/inc/unx/gtk/glomenu.h2
-rw-r--r--vcl/source/filter/igif/decode.hxx2
-rw-r--r--vcl/source/fontsubset/cff.cxx10
4 files changed, 10 insertions, 8 deletions
diff --git a/vcl/inc/unx/cpdmgr.hxx b/vcl/inc/unx/cpdmgr.hxx
index ed1929744163..8e15cb0ba27b 100644
--- a/vcl/inc/unx/cpdmgr.hxx
+++ b/vcl/inc/unx/cpdmgr.hxx
@@ -73,8 +73,8 @@ class CPDManager : public PrinterInfoManager
virtual void initialize() override;
#if ENABLE_DBUS && ENABLE_GIO
- static void onNameAcquired(GDBusConnection *connection, const gchar* name, gpointer user_data);
- static void onNameLost (GDBusConnection *, const gchar *name, gpointer);
+ static void onNameAcquired(GDBusConnection *connection, const char* name, void* user_data);
+ static void onNameLost (GDBusConnection *, const char *name, void*);
static void printerAdded (GDBusConnection *connection,
const gchar *sender_name,
const gchar *object_path,
diff --git a/vcl/inc/unx/gtk/glomenu.h b/vcl/inc/unx/gtk/glomenu.h
index a0150a845e3e..5586aa4edce1 100644
--- a/vcl/inc/unx/gtk/glomenu.h
+++ b/vcl/inc/unx/gtk/glomenu.h
@@ -39,7 +39,7 @@ gint g_lo_menu_get_n_items_from_section (GLOMenu
void g_lo_menu_insert (GLOMenu *menu,
gint position,
- const gchar *label);
+ const char *label);
void g_lo_menu_insert_in_section (GLOMenu *menu,
gint section,
diff --git a/vcl/source/filter/igif/decode.hxx b/vcl/source/filter/igif/decode.hxx
index 24ba7dbe5701..bdf9e64f8c74 100644
--- a/vcl/source/filter/igif/decode.hxx
+++ b/vcl/source/filter/igif/decode.hxx
@@ -57,7 +57,7 @@ public:
explicit GIFLZWDecompressor( sal_uInt8 cDataSize );
~GIFLZWDecompressor();
- Scanline DecompressBlock( sal_uInt8* pSrc, sal_uInt8 cBufSize, sal_uLong& rCount, bool& rEOI );
+ sal_uInt8* DecompressBlock( sal_uInt8* pSrc, sal_uInt8 cBufSize, sal_uLong& rCount, bool& rEOI );
};
#endif
diff --git a/vcl/source/fontsubset/cff.cxx b/vcl/source/fontsubset/cff.cxx
index 79c344d8fbfb..ade0a6607a8f 100644
--- a/vcl/source/fontsubset/cff.cxx
+++ b/vcl/source/fontsubset/cff.cxx
@@ -31,6 +31,8 @@ typedef sal_uInt8 U8;
typedef sal_uInt16 U16;
typedef sal_Int64 S64;
+typedef sal_Int32 GlyphWidth;
+
typedef double RealType;
typedef RealType ValType;
@@ -271,7 +273,7 @@ public:
bool initialCffRead();
void emitAsType1( class Type1Emitter&,
const sal_GlyphId* pGlyphIds, const U8* pEncoding,
- sal_Int32* pGlyphWidths, int nGlyphCount, FontSubsetInfo& );
+ GlyphWidth* pGlyphWidths, int nGlyphCount, FontSubsetInfo& );
private:
int convert2Type1Ops( CffLocal*, const U8* pType2Ops, int nType2Len, U8* pType1Ops);
@@ -1732,7 +1734,7 @@ void Type1Emitter::emitValVector( const char* pLineHead, const char* pLineTail,
void CffSubsetterContext::emitAsType1( Type1Emitter& rEmitter,
const sal_GlyphId* pReqGlyphIds, const U8* pReqEncoding,
- sal_Int32* pGlyphWidths, int nGlyphCount, FontSubsetInfo& rFSInfo)
+ GlyphWidth* pGlyphWidths, int nGlyphCount, FontSubsetInfo& rFSInfo)
{
// prepare some fontdirectory details
static const int nUniqueIdBase = 4100000; // using private-interchange UniqueIds
@@ -1973,7 +1975,7 @@ void CffSubsetterContext::emitAsType1( Type1Emitter& rEmitter,
ValType aCharWidth = getCharWidth();
if( maFontMatrix.size() >= 4)
aCharWidth *= 1000.0F * maFontMatrix[0];
- pGlyphWidths[i] = static_cast<sal_Int32>(aCharWidth);
+ pGlyphWidths[i] = static_cast<GlyphWidth>(aCharWidth);
}
}
pOut += sprintf( pOut, "end end\nreadonly put\nput\n");
@@ -2027,7 +2029,7 @@ void CffSubsetterContext::emitAsType1( Type1Emitter& rEmitter,
rFSInfo.m_aPSName = OUString( rEmitter.maSubsetName, strlen(rEmitter.maSubsetName), RTL_TEXTENCODING_UTF8 );
}
-bool FontSubsetInfo::CreateFontSubsetFromCff( sal_Int32* pOutGlyphWidths )
+bool FontSubsetInfo::CreateFontSubsetFromCff( GlyphWidth* pOutGlyphWidths )
{
CffSubsetterContext aCff( mpInFontBytes, mnInByteLength);
bool bRC = aCff.initialCffRead();