Kaydet (Commit) c9bb4838 authored tarafından Noel Grandin's avatar Noel Grandin

Revert "new loplugin typedefparam"

This reverts commit 9865440d.

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.
üst 9865440d
......@@ -26,8 +26,8 @@ namespace oglcanvas
void renderComplexPolyPolygon( const ::basegfx::B2DPolyPolygon& rPolyPoly );
void renderPolyPolygon( const ::basegfx::B2DPolyPolygon& rPolyPoly );
void setupState( const ::basegfx::B2DHomMatrix& rTransform,
GLenum eSrcBlend,
GLenum eDstBlend,
unsigned int eSrcBlend,
unsigned int eDstBlend,
const com::sun::star::rendering::ARGBColor& rColor );
void renderOSD( const std::vector<double>& rNumbers, double scale );
......
......@@ -87,7 +87,7 @@ namespace canvas
bool drawRectangularArea(
double fAlpha,
const ::basegfx::B2DPoint& rPos,
const ::basegfx::B2DRectangle& rArea,
const ::basegfx::B2DRange& rArea,
const ::basegfx::B2DHomMatrix& rTransform );
/** Render the surface content to screen.
......
......@@ -472,7 +472,7 @@ void InternalData::deleteRow( sal_Int32 nAtIndex )
dump();
}
void InternalData::setComplexRowLabels( const tVecVecAny& rNewRowLabels )
void InternalData::setComplexRowLabels( const vector< vector< uno::Any > >& rNewRowLabels )
{
m_aRowLabels = rNewRowLabels;
sal_Int32 nNewRowCount = static_cast< sal_Int32 >( m_aRowLabels.size() );
......@@ -487,7 +487,7 @@ const InternalData::tVecVecAny& InternalData::getComplexRowLabels() const
return m_aRowLabels;
}
void InternalData::setComplexColumnLabels( const tVecVecAny& rNewColumnLabels )
void InternalData::setComplexColumnLabels( const vector< vector< uno::Any > >& rNewColumnLabels )
{
m_aColumnLabels = rNewColumnLabels;
sal_Int32 nNewColumnCount = static_cast< sal_Int32 >( m_aColumnLabels.size() );
......
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
/*
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
#include "tools/solar.h"
namespace test1
{
class Foo
{
void bar(sal_uIntPtr x); // expected-note {{declaration site here [loplugin:typedefparam]}}
sal_uIntPtr bar(); // expected-note {{declaration site here [loplugin:typedefparam]}}
};
void Foo::bar(sal_uLong)
// expected-error@-1 {{function param 0 at definition site does not match function param at declaration site, 'sal_uLong' (aka 'unsigned long') vs 'sal_uIntPtr' (aka 'unsigned long') [loplugin:typedefparam]}}
{
}
sal_uLong Foo::bar()
// expected-error@-1 {{function return type at definition site does not match function param at declaration site, 'sal_uLong' (aka 'unsigned long') vs 'sal_uIntPtr' (aka 'unsigned long') [loplugin:typedefparam]}}
{
return 1;
}
};
// Carve out an exception for the "typedef struct S {...} T" idiom we use in the UNO code
namespace test2
{
typedef struct Foo
{
int x;
} FooT;
void bar(struct Foo*);
void bar(FooT*){
// no warning expected
};
};
namespace test3
{
typedef struct Foo
{
int x;
} FooT;
void bar(Foo*);
void bar(FooT*){
// no warning expected
};
};
// check method overrides
namespace test4
{
struct Struct1
{
virtual sal_uIntPtr foo1();
// expected-note@-1 {{super-class method here [loplugin:typedefparam]}}
virtual void foo2(sal_uIntPtr);
// expected-note@-1 {{super-class method here [loplugin:typedefparam]}}
virtual ~Struct1();
};
struct Struct2 : public Struct1
{
virtual sal_uLong foo1() override;
// expected-error@-1 {{method return type does not match overridden method 'sal_uLong' (aka 'unsigned long') vs 'sal_uIntPtr' (aka 'unsigned long') [loplugin:typedefparam]}}
virtual void foo2(sal_uLong) override;
// expected-error@-1 {{method param 0 does not match overridden method param 'sal_uLong' (aka 'unsigned long') vs 'sal_uIntPtr' (aka 'unsigned long') [loplugin:typedefparam]}}
};
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
This diff is collapsed.
......@@ -60,6 +60,7 @@ namespace mysqlc
using ::com::sun::star::sdbc::SQLException;
using ::com::sun::star::sdbc::SQLWarning;
using ::com::sun::star::uno::RuntimeException;
typedef css::uno::Reference<css::container::XNameAccess> my_XNameAccessRef;
typedef ::cppu::WeakComponentImplHelper3<css::sdbc::XConnection, css::sdbc::XWarningsSupplier,
css::lang::XServiceInfo>
......@@ -160,10 +161,9 @@ public:
sal_Int32 SAL_CALL getTransactionIsolation() override;
css::uno::Reference<css::container::XNameAccess> SAL_CALL getTypeMap() override;
my_XNameAccessRef SAL_CALL getTypeMap() override;
void SAL_CALL
setTypeMap(const css::uno::Reference<css::container::XNameAccess>& typeMap) override;
void SAL_CALL setTypeMap(const my_XNameAccessRef& typeMap) override;
// XCloseable
void SAL_CALL close() override;
// XWarningsSupplier
......
......@@ -167,8 +167,7 @@ public:
css::uno::Reference<css::io::XInputStream>
SAL_CALL getCharacterStream(sal_Int32 column) override;
Any SAL_CALL getObject(
sal_Int32 column, const css::uno::Reference<css::container::XNameAccess>& typeMap) override;
Any SAL_CALL getObject(sal_Int32 column, const my_XNameAccessRef& typeMap) override;
css::uno::Reference<css::sdbc::XRef> SAL_CALL getRef(sal_Int32 column) override;
css::uno::Reference<css::sdbc::XBlob> SAL_CALL getBlob(sal_Int32 column) override;
......
......@@ -199,8 +199,7 @@ public:
css::uno::Reference<css::io::XInputStream>
SAL_CALL getCharacterStream(sal_Int32 column) override;
Any SAL_CALL getObject(
sal_Int32 column, const css::uno::Reference<css::container::XNameAccess>& typeMap) override;
Any SAL_CALL getObject(sal_Int32 column, const my_XNameAccessRef& typeMap) override;
css::uno::Reference<css::sdbc::XRef> SAL_CALL getRef(sal_Int32 column) override;
css::uno::Reference<css::sdbc::XBlob> SAL_CALL getBlob(sal_Int32 column) override;
......
......@@ -31,7 +31,7 @@ namespace cppu {
sal_Bool component_writeInfoHelper(
SAL_UNUSED_PARAMETER void *, void * pRegistryKey,
const struct ImplementationEntry entries[])
ImplementationEntry const * entries)
{
bool bRet = false;
try
......@@ -61,8 +61,8 @@ sal_Bool component_writeInfoHelper(
void * component_getFactoryHelper(
sal_Char const * pImplName, SAL_UNUSED_PARAMETER void *,
SAL_UNUSED_PARAMETER void *, const struct ImplementationEntry entries[])
char const * pImplName, SAL_UNUSED_PARAMETER void *,
SAL_UNUSED_PARAMETER void *, ImplementationEntry const * entries)
{
void * pRet = nullptr;
......
......@@ -101,7 +101,7 @@ namespace svx
const OUString& getSecondaryText() const { return m_sSecondaryText; }
public:
void Paint( vcl::RenderContext& _rDevice, const ::tools::Rectangle& _rRect, DrawTextFlags _nTextStyle,
void Paint( OutputDevice& _rDevice, const ::tools::Rectangle& _rRect, DrawTextFlags _nTextStyle,
::tools::Rectangle* _pPrimaryLocation, ::tools::Rectangle* _pSecondaryLocation );
};
......
......@@ -48,7 +48,7 @@ void HsqlBinaryNode::readChildren(HsqlRowInputStream const& input)
}
std::vector<css::uno::Any> HsqlBinaryNode::readRow(HsqlRowInputStream& input,
const std::vector<ColumnDefinition>& aColTypes,
const ColumnTypeVector& aColTypes,
sal_Int32 nIndexCount)
{
// skip first 4 bytes (size), and index nodes, 16 bytes each
......
......@@ -48,8 +48,12 @@ using namespace css::io;
using namespace css::uno;
using namespace css::sdbc;
void lcl_setParams(const std::vector<Any>& row, Reference<XParameters> const& xParam,
const std::vector<dbahsql::ColumnDefinition>& rColTypes)
using ColumnTypeVector = std::vector<dbahsql::ColumnDefinition>;
using RowVector = std::vector<Any>;
using IndexVector = std::vector<sal_Int32>;
void lcl_setParams(const RowVector& row, Reference<XParameters> const& xParam,
const ColumnTypeVector& rColTypes)
{
assert(row.size() == rColTypes.size());
size_t nColIndex = 0;
......@@ -178,8 +182,7 @@ void lcl_setParams(const std::vector<Any>& row, Reference<XParameters> const& xP
}
}
OUString lcl_createInsertStatement(const OUString& sTableName,
const std::vector<dbahsql::ColumnDefinition>& rColTypes)
OUString lcl_createInsertStatement(const OUString& sTableName, const ColumnTypeVector& rColTypes)
{
assert(rColTypes.size() > 0);
OUStringBuffer sql("INSERT INTO ");
......@@ -218,8 +221,8 @@ HsqlImporter::HsqlImporter(Reference<XConnection>& rConnection, const Reference<
m_xStorage.set(rStorage);
}
void HsqlImporter::insertRow(const std::vector<css::uno::Any>& xRows, const OUString& sTableName,
const std::vector<ColumnDefinition>& rColTypes)
void HsqlImporter::insertRow(const RowVector& xRows, const OUString& sTableName,
const ColumnTypeVector& rColTypes)
{
OUString sStatement = lcl_createInsertStatement(sTableName, rColTypes);
Reference<XPreparedStatement> xStatement = m_rConnection->prepareStatement(sStatement);
......@@ -233,8 +236,8 @@ void HsqlImporter::insertRow(const std::vector<css::uno::Any>& xRows, const OUSt
}
void HsqlImporter::processTree(HsqlBinaryNode& rNode, HsqlRowInputStream& rStream,
const std::vector<ColumnDefinition>& rColTypes,
const OUString& sTableName, sal_Int32 nIndexCount)
const ColumnTypeVector& rColTypes, const OUString& sTableName,
sal_Int32 nIndexCount)
{
rNode.readChildren(rStream);
sal_Int32 nNext = rNode.getLeft();
......@@ -264,7 +267,7 @@ void HsqlImporter::processTree(HsqlBinaryNode& rNode, HsqlRowInputStream& rStrea
* Balance: ?
* Left/Right/Parent: File position of the Left/Right/Parent child
*/
void HsqlImporter::parseTableRows(const std::vector<sal_Int32>& rIndexes,
void HsqlImporter::parseTableRows(const IndexVector& rIndexes,
const std::vector<ColumnDefinition>& rColTypes,
const OUString& sTableName)
{
......
......@@ -167,7 +167,7 @@ void SchemaParser::parseSchema()
}
}
std::vector<ColumnDefinition> SchemaParser::getTableColumnTypes(const OUString& sTableName) const
ColumnTypeVector SchemaParser::getTableColumnTypes(const OUString& sTableName) const
{
return m_ColumnTypes.at(sTableName);
}
......
......@@ -134,6 +134,8 @@ using namespace css::io;
using namespace boost::posix_time;
using namespace boost::gregorian;
typedef std::vector<ColumnDefinition> ColumnTypeVector;
HsqlRowInputStream::HsqlRowInputStream() {}
void HsqlRowInputStream::setInputStream(Reference<XInputStream> const& rStream)
......@@ -237,7 +239,7 @@ bool HsqlRowInputStream::checkNull()
return nNull == 0;
}
std::vector<Any> HsqlRowInputStream::readOneRow(const std::vector<ColumnDefinition>& nColTypes)
std::vector<Any> HsqlRowInputStream::readOneRow(const ColumnTypeVector& nColTypes)
{
auto nLen = nColTypes.size();
std::vector<Any> aData;
......
......@@ -86,7 +86,7 @@ namespace dbaui
{
}
CharsetDisplayDerefHelper::CharsetDisplayDerefHelper(const ::dbtools::CharsetIteratorDerefHelper& _rBase, const OUString& _rDisplayName)
CharsetDisplayDerefHelper::CharsetDisplayDerefHelper(const CharsetDisplayDerefHelper_Base& _rBase, const OUString& _rDisplayName)
:CharsetDisplayDerefHelper_Base(_rBase)
,m_sDisplayName(_rDisplayName)
{
......
......@@ -1206,7 +1206,7 @@ hchar_string hstr2ucsstr(hchar const* hstr)
* Convert strings of kchar type, which can contain Korean, English and others
* to strings of hchar type of Hangul Word Processor
*/
hchar_string kstr2hstr(uchar const* src)
hchar_string kstr2hstr(unsigned char const* src)
{
hchar_string ret;
if (!src)
......
......@@ -24,7 +24,6 @@
#include <basegfx/point/b2dpoint.hxx>
#include <basegfx/vector/b2dvector.hxx>
#include <basegfx/range/b2drange.hxx>
#include <basegfx/range/b2drectangle.hxx>
#include <vector>
#include <algorithm>
......@@ -360,8 +359,8 @@ namespace canvas
bool areSpritesChanged( const UpdateArea& rUpdateArea ) const;
bool isAreaUpdateNotOpaque( const ::basegfx::B2DRectangle& rUpdateRect,
const AreaComponent& rComponent ) const;
bool isAreaUpdateNotOpaque( const ::basegfx::B2DRange& rUpdateRect,
const AreaComponent& rComponent ) const;
bool isAreaUpdateOpaque( const UpdateArea& rUpdateArea,
::std::size_t nNumSprites ) const;
......@@ -379,8 +378,8 @@ namespace canvas
@param rUpdateArea
Area to check for scroll update optimization
*/
bool isAreaUpdateScroll( ::basegfx::B2DRectangle& o_rMoveStart,
::basegfx::B2DRectangle& o_rMoveEnd,
bool isAreaUpdateScroll( ::basegfx::B2DRange& o_rMoveStart,
::basegfx::B2DRange& o_rMoveEnd,
const UpdateArea& rUpdateArea,
::std::size_t nNumSprites ) const;
......
......@@ -216,9 +216,13 @@ namespace comphelper
/** is a specialization of OListenerContainer which saves you some additional type casts,
by making the required listener and event types template arguments.
*/
template< class ListenerClass, class EventClass >
template< class LISTENER, class EVENT >
class OListenerContainerBase : public OListenerContainer
{
public:
typedef LISTENER ListenerClass;
typedef EVENT EventClass;
public:
OListenerContainerBase( ::osl::Mutex& _rMutex ) : OListenerContainer( _rMutex )
{
......
......@@ -96,7 +96,7 @@ public:
bool isNotesPage() const { return mbNotes; }
void setLayoutValueToken( sal_Int32 nLayoutValueToken ) { mnLayoutValueToken = nLayoutValueToken; }
sal_Int16 getLayoutFromValueToken();
short getLayoutFromValueToken();
const oox::drawingml::TextListStylePtr& getDefaultTextStyle() const { return maDefaultTextStylePtr; }
......
......@@ -130,7 +130,7 @@ public:
virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch( const css::util::URL & aURL ,
const OUString & sTargetFrameName,
sal_Int32 eSearchFlags ) override ;
FrameSearchFlags eSearchFlags ) override ;
virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& seqDescriptor ) override ;
......
......@@ -331,7 +331,7 @@ protected:
virtual bool SeekRow( long nRow ) = 0;
void DrawCursor();
void PaintData(vcl::Window const & rWin, vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect);
virtual void PaintField(vcl::RenderContext& rDev, const tools::Rectangle& rRect, sal_uInt16 nColumnId) const = 0;
virtual void PaintField(OutputDevice& rDev, const tools::Rectangle& rRect, sal_uInt16 nColumnId) const = 0;
// Advice for the subclass: the visible scope of rows has changed.
// The subclass is able to announce changes of the model with the
// help of the methods RowInserted and RowRemoved. Because of the
......
......@@ -622,7 +622,7 @@ namespace svt
void implCreateActiveAccessible( );
private:
virtual void PaintField(vcl::RenderContext& rDev, const tools::Rectangle& rRect,
virtual void PaintField(OutputDevice& rDev, const tools::Rectangle& rRect,
sal_uInt16 nColumnId ) const override;
using Control::ImplInitSettings;
SVT_DLLPRIVATE void ImplInitSettings( bool bFont, bool bForeground, bool bBackground );
......
......@@ -32,9 +32,6 @@ namespace vcl { class Window; }
class OutputDevice;
class StyleSettings;
namespace vcl {
typedef OutputDevice RenderContext;
};
namespace svt { namespace table
......@@ -92,7 +89,7 @@ namespace svt { namespace table
the style to be used for drawing
*/
virtual void PaintHeaderArea(
vcl::RenderContext& _rDevice, const tools::Rectangle& _rArea,
OutputDevice& _rDevice, const tools::Rectangle& _rArea,
bool _bIsColHeaderArea, bool _bIsRowHeaderArea,
const StyleSettings& _rStyle ) = 0;
......@@ -111,7 +108,7 @@ namespace svt { namespace table
the style to be used for drawing
*/
virtual void PaintColumnHeader( ColPos _nCol, bool _bActive,
vcl::RenderContext& _rDevice, const tools::Rectangle& _rArea,
OutputDevice& _rDevice, const tools::Rectangle& _rArea,
const StyleSettings& _rStyle ) = 0;
/** prepares a row for painting
......@@ -146,7 +143,7 @@ namespace svt { namespace table
the style to be used for drawing
*/
virtual void PrepareRow( RowPos _nRow, bool i_hasControlFocus, bool _bSelected,
vcl::RenderContext& _rDevice, const tools::Rectangle& _rRowArea,
OutputDevice& _rDevice, const tools::Rectangle& _rRowArea,
const StyleSettings& _rStyle ) = 0;
/** paints the header of a row
......@@ -175,7 +172,7 @@ namespace svt { namespace table
the style to be used for drawing
*/
virtual void PaintRowHeader( bool i_hasControlFocus, bool _bSelected,
vcl::RenderContext& _rDevice, tools::Rectangle const & _rArea,
OutputDevice& _rDevice, tools::Rectangle const & _rArea,
StyleSettings const & _rStyle ) = 0;
/** paints a certain cell
......@@ -206,7 +203,7 @@ namespace svt { namespace table
*/
virtual void PaintCell( ColPos const i_col,
bool i_hasControlFocus, bool _bSelected,
vcl::RenderContext& _rDevice, const tools::Rectangle& _rArea,
OutputDevice& _rDevice, const tools::Rectangle& _rArea,
const StyleSettings& _rStyle ) = 0;
/** draws a cell cursor in the given rectangle
......
......@@ -71,7 +71,7 @@ public:
virtual void RecalculateFont(vcl::RenderContext& rRenderContext);
void SelectCharacter( sal_UCS4 cNew );
void SelectCharacter( sal_uInt32 cNew );
virtual sal_UCS4 GetSelectCharacter() const;
void createContextMenu();
......
......@@ -140,7 +140,7 @@ private:
// BrowseBox
virtual bool SeekRow( long nRow ) override;
virtual void PaintField( vcl::RenderContext& rDev, const tools::Rectangle& rRect, sal_uInt16 nColumnId ) const override;
virtual void PaintField( OutputDevice& rDev, const tools::Rectangle& rRect, sal_uInt16 nColumnId ) const override;
virtual void DoubleClick( const BrowserMouseEvent& rEvt ) override;
virtual void Select() override;
virtual sal_Int8 AcceptDrop( const BrowserAcceptDropEvent& rEvt ) override;
......
......@@ -20,7 +20,6 @@
#ifndef INCLUDED_SVX_SDRPAGEWINDOW_HXX
#define INCLUDED_SVX_SDRPAGEWINDOW_HXX
#include <basegfx/range/b2irectangle.hxx>
#include <svx/sdr/overlay/overlaymanager.hxx>
#include <svx/svdtypes.hxx>
#include <svx/svxdllapi.h>
......@@ -75,7 +74,7 @@ public:
void PrePaint();
void PrepareRedraw(const vcl::Region& rReg);
void RedrawAll( sdr::contact::ViewObjectContactRedirector* pRedirector );
void RedrawLayer( const SdrLayerID* pId, sdr::contact::ViewObjectContactRedirector* pRedirector, basegfx::B2IRectangle const*);
void RedrawLayer( const SdrLayerID* pId, sdr::contact::ViewObjectContactRedirector* pRedirector, basegfx::B2IRange const*);
// Invalidate call, used from ObjectContact(OfPageView) in InvalidatePartOfView(...)
void InvalidatePageWindow(const basegfx::B2DRange& rRange);
......
......@@ -32,7 +32,6 @@
#include <memory>
#include <vector>
#include <basegfx/polygon/b2dpolypolygon.hxx>
#include <basegfx/range/b2irectangle.hxx>
namespace vcl { class Region; }
......@@ -168,7 +167,7 @@ public:
void DrawLayer(SdrLayerID nID, OutputDevice* pGivenTarget, sdr::contact::ViewObjectContactRedirector* pRedirector = nullptr,
const tools::Rectangle& rRect = tools::Rectangle(),
basegfx::B2IRectangle const* pPageFrame = nullptr);
basegfx::B2IRange const* pPageFrame = nullptr);
void DrawPageViewGrid(OutputDevice& rOut, const tools::Rectangle& rRect, Color aColor = COL_BLACK );
tools::Rectangle GetPageRect() const;
......
......@@ -139,7 +139,7 @@ private:
friend class ::OutputDevice;
int findRangeIndex( sal_UCS4 ) const;
int findRangeIndex( sal_uInt32 ) const;
FontCharMap( ImplFontCharMapRef const & pIFCMap );
......@@ -153,9 +153,9 @@ class VCL_PLUGIN_PUBLIC CmapResult
{
public:
explicit CmapResult( bool bSymbolic = false,
const sal_UCS4* pRangeCodes = nullptr, int nRangeCount = 0 );
const sal_uInt32* pRangeCodes = nullptr, int nRangeCount = 0 );
const sal_UCS4* mpRangeCodes;
const sal_uInt32* mpRangeCodes;
const int* mpStartGlyphs;
const sal_uInt16* mpGlyphIds;
int mnRangeCount;
......
......@@ -98,7 +98,7 @@ void SAL_CALL LazyMathBufferingContext::characters(OUString const& rChars)
} // namespace formulaimport
rtl::Reference<core::ContextHandler> CreateLazyMathBufferingContext(
core::ContextHandlerRef CreateLazyMathBufferingContext(
core::ContextHandler const& rParent, drawingml::TextParagraph & rPara)
{
return new formulaimport::LazyMathBufferingContext(rParent, rPara);
......
......@@ -69,7 +69,7 @@ oslMutex SAL_CALL osl_createMutex()
return pMutex;
}
void SAL_CALL osl_destroyMutex(oslMutex pMutex)
void SAL_CALL osl_destroyMutex(oslMutexImpl *pMutex)
{
SAL_WARN_IF(!pMutex, "sal.osl.mutex", "null pMutex");
......@@ -87,7 +87,7 @@ void SAL_CALL osl_destroyMutex(oslMutex pMutex)
}
}
sal_Bool SAL_CALL osl_acquireMutex(oslMutex pMutex)
sal_Bool SAL_CALL osl_acquireMutex(oslMutexImpl *pMutex)
{
SAL_WARN_IF(!pMutex, "sal.osl.mutex", "null pMutex");
......@@ -108,7 +108,7 @@ sal_Bool SAL_CALL osl_acquireMutex(oslMutex pMutex)
return false;
}
sal_Bool SAL_CALL osl_tryToAcquireMutex(oslMutex pMutex)
sal_Bool SAL_CALL osl_tryToAcquireMutex(oslMutexImpl *pMutex)
{
bool result = false;
......@@ -125,7 +125,7 @@ sal_Bool SAL_CALL osl_tryToAcquireMutex(oslMutex pMutex)
return result;
}
sal_Bool SAL_CALL osl_releaseMutex(oslMutex pMutex)
sal_Bool SAL_CALL osl_releaseMutex(oslMutexImpl *pMutex)
{
SAL_WARN_IF(!pMutex, "sal.osl.mutex", "null pMutex");
......
......@@ -197,7 +197,7 @@ rtl_TextEncoding SAL_CALL rtl_getTextEncodingFromWindowsCharset( sal_uInt8 nWinC
/* ----------------------------------------------------------------------- */
rtl_TextEncoding SAL_CALL rtl_getTextEncodingFromUnixCharset( const sal_Char* pUnixCharset )
rtl_TextEncoding SAL_CALL rtl_getTextEncodingFromUnixCharset( const char* pUnixCharset )
{
/* See <ftp://ftp.x.org/pub/DOCS/registry>, section 14 ("Font Charset
* (Registry and Encoding) Names").
......@@ -468,7 +468,7 @@ rtl_TextEncoding SAL_CALL rtl_getTextEncodingFromUnixCharset( const sal_Char* pU
/* ----------------------------------------------------------------------- */
rtl_TextEncoding SAL_CALL rtl_getTextEncodingFromMimeCharset( const sal_Char* pMimeCharset )
rtl_TextEncoding SAL_CALL rtl_getTextEncodingFromMimeCharset( const char* pMimeCharset )
{
/* All Identifiers are in lower case and contain only alphanumeric */
/* characters. The function search for the first equal string in */
......@@ -788,7 +788,7 @@ sal_uInt8 SAL_CALL rtl_getBestWindowsCharsetFromTextEncoding( rtl_TextEncoding e
/* ----------------------------------------------------------------------- */
const sal_Char* SAL_CALL rtl_getBestUnixCharsetFromTextEncoding( rtl_TextEncoding eTextEncoding )
const char* SAL_CALL rtl_getBestUnixCharsetFromTextEncoding( rtl_TextEncoding eTextEncoding )
{
const ImplTextEncodingData* pData = Impl_getTextEncodingData( eTextEncoding );
if ( pData )
......@@ -808,7 +808,7 @@ char const * SAL_CALL rtl_getMimeCharsetFromTextEncoding(rtl_TextEncoding
p->mpBestMimeCharset : nullptr;
}
const sal_Char* SAL_CALL rtl_getBestMimeCharsetFromTextEncoding( rtl_TextEncoding eTextEncoding )
const char* SAL_CALL rtl_getBestMimeCharsetFromTextEncoding( rtl_TextEncoding eTextEncoding )
{
const ImplTextEncodingData* pData = Impl_getTextEncodingData( eTextEncoding );
if ( pData )
......
......@@ -155,7 +155,7 @@ void SAL_CALL rtl_resetTextToUnicodeContext( rtl_TextToUnicodeConverter hConvert
sal_Size SAL_CALL rtl_convertTextToUnicode( rtl_TextToUnicodeConverter hConverter,
rtl_TextToUnicodeContext hContext,
const sal_Char* pSrcBuf, sal_Size nSrcBytes,
const char* pSrcBuf, sal_Size nSrcBytes,
sal_Unicode* pDestBuf, sal_Size nDestChars,
sal_uInt32 nFlags, sal_uInt32* pInfo,
sal_Size* pSrcCvtBytes )
......@@ -251,7 +251,7 @@ void SAL_CALL rtl_resetUnicodeToTextContext( rtl_UnicodeToTextConverter hConvert
sal_Size SAL_CALL rtl_convertUnicodeToText( rtl_UnicodeToTextConverter hConverter,
rtl_UnicodeToTextContext hContext,
const sal_Unicode* pSrcBuf, sal_Size nSrcChars,
sal_Char* pDestBuf, sal_Size nDestBytes,
char* pDestBuf, sal_Size nDestBytes,
sal_uInt32 nFlags, sal_uInt32* pInfo,
sal_Size* pSrcCvtChars )
{
......
......@@ -53,7 +53,7 @@ public:
void removeSegment(SCCOLROW nPos1, SCCOLROW nPos2);
void insertSegment(SCCOLROW nPos, SCCOLROW nSize, bool bSkipStartBoundary);
SCCOLROW findLastTrue(ValueType nValue) const;
SCROW findLastTrue(ValueType nValue) const;
// range iteration
bool getFirst(RangeData& rData);
......
......@@ -1458,7 +1458,7 @@ void XclExpComments::SaveXml( XclExpXmlStream& rStrm )
Authors::const_iterator aAuthorsBegin = aAuthors.begin();
for( size_t i = 0; i < nNotes; ++i )
{
XclExpRecordList< XclExpNote >::RecordRefType xNote = mrNotes.GetRecord( i );
XclExpNoteList::RecordRefType xNote = mrNotes.GetRecord( i );
Authors::const_iterator aAuthor = aAuthors.find(
XclXmlUtils::ToOUString( xNote->GetAuthor() ) );
sal_Int32 nAuthorId = distance( aAuthorsBegin, aAuthor );
......
......@@ -94,9 +94,9 @@ private:
public:
LotusRangeList();
~LotusRangeList();
inline LR_ID GetIndex( SCCOL nCol, SCROW nRow );
inline LR_ID GetIndex( SCCOL nColS, SCROW nRowS, SCCOL nColE, SCROW nRowE );
LR_ID GetIndex( const LotusRange& );
inline sal_uInt16 GetIndex( SCCOL nCol, SCROW nRow );
inline sal_uInt16 GetIndex( SCCOL nColS, SCROW nRowS, SCCOL nColE, SCROW nRowE );
sal_uInt16 GetIndex( const LotusRange& );
void Append( std::unique_ptr<LotusRange> pLR );
};
......
......@@ -125,7 +125,7 @@ public:
/** Sets the VBA project storage used to import VBA source code and forms. */
void setVbaProjectStorage( const StorageRef& rxVbaPrjStrg );
/** Sets the index of the current Calc sheet, if filter currently processes a sheet. */
void setCurrentSheetIndex( SCTAB nSheet );
void setCurrentSheetIndex( sal_Int16 nSheet );
/** Final conversion after importing the workbook. */
void finalizeWorkbookImport();
void useInternalChartDataTable( bool bInternal );
......