[Libreoffice-commits] core.git: 17 commits - chart2/source compilerplugins/clang connectivity/source dbaccess/source extensions/source filter/source fpicker/source include/canvas include/svx reportdesign/source sc/inc sc/source sd/source svx/source sw/inc sw/source vcl/inc
Stephan Bergmann
sbergman at redhat.com
Mon Apr 18 13:30:35 UTC 2016
chart2/source/view/main/AbstractShapeFactory.cxx | 4
compilerplugins/clang/plugin.cxx | 3
connectivity/source/drivers/macab/MacabDriver.hxx | 2
connectivity/source/drivers/macab/MacabRecords.cxx | 2
connectivity/source/drivers/macab/MacabRecords.hxx | 2
connectivity/source/drivers/macab/MacabTable.hxx | 4
dbaccess/source/core/dataaccess/connection.cxx | 8 -
dbaccess/source/core/dataaccess/databasecontext.cxx | 32 +++----
dbaccess/source/core/dataaccess/databasedocument.cxx | 54 +++++------
dbaccess/source/core/dataaccess/databasedocument.hxx | 22 ++--
dbaccess/source/core/dataaccess/databaseregistrations.cxx | 60 ++++++-------
dbaccess/source/core/dataaccess/definitioncontainer.cxx | 18 +--
dbaccess/source/core/dataaccess/documenteventexecutor.cxx | 8 -
dbaccess/source/core/dataaccess/documenteventnotifier.cxx | 56 ++++++------
dbaccess/source/core/dataaccess/documenteventnotifier.hxx | 18 +--
dbaccess/source/core/dataaccess/documentevents.cxx | 20 ++--
dbaccess/source/core/dataaccess/intercept.cxx | 50 +++++-----
dbaccess/source/core/inc/DatabaseDataProvider.hxx | 8 -
dbaccess/source/filter/xml/xmlfilter.cxx | 7 -
dbaccess/source/sdbtools/connection/connectiontools.cxx | 4
dbaccess/source/sdbtools/connection/objectnames.cxx | 32 +++----
dbaccess/source/sdbtools/connection/tablename.cxx | 12 +-
dbaccess/source/sdbtools/connection/tablename.hxx | 2
extensions/source/scanner/sane.cxx | 12 +-
filter/source/flash/swfexporter.cxx | 6 -
filter/source/flash/swfwriter.cxx | 8 -
filter/source/flash/swfwriter.hxx | 4
filter/source/flash/swfwriter1.cxx | 22 ++--
filter/source/flash/swfwriter2.cxx | 8 -
filter/source/msfilter/msdffimp.cxx | 4
filter/source/msfilter/msoleexp.cxx | 8 -
filter/source/xsltdialog/xmlfilterjar.cxx | 6 -
fpicker/source/aqua/FilterHelper.hxx | 4
fpicker/source/aqua/resourceprovider.mm | 6 -
include/canvas/vclwrapper.hxx | 4
include/svx/fmdpage.hxx | 4
include/svx/unopage.hxx | 4
reportdesign/source/core/inc/ReportDrawPage.hxx | 4
reportdesign/source/core/sdr/ReportDrawPage.cxx | 10 +-
sc/inc/pageuno.hxx | 2
sc/source/ui/unoobj/pageuno.cxx | 4
sd/source/ui/inc/unopage.hxx | 4
sd/source/ui/unoidl/unopage.cxx | 16 +--
svx/source/fmcomp/gridcell.cxx | 61 +++++--------
svx/source/form/filtnav.cxx | 42 ++++-----
svx/source/form/fmdpage.cxx | 8 -
svx/source/form/fmtools.cxx | 4
svx/source/form/fmvwimp.cxx | 4
svx/source/form/formcontroller.cxx | 64 +++++++-------
svx/source/form/formcontrolling.cxx | 16 +--
svx/source/inc/fmvwimp.hxx | 4
svx/source/inc/formcontroller.hxx | 14 +--
svx/source/inc/formcontrolling.hxx | 2
svx/source/inc/gridcell.hxx | 16 +--
svx/source/svdraw/svdobj.cxx | 2
svx/source/unodraw/shapepropertynotifier.cxx | 4
svx/source/unodraw/unopage.cxx | 8 -
svx/source/unodraw/unoshap2.cxx | 2
svx/source/unodraw/unoshap3.cxx | 2
svx/source/xml/xmlxtimp.cxx | 20 +---
sw/inc/unodraw.hxx | 4
sw/source/core/unocore/unodraw.cxx | 10 +-
sw/source/filter/xml/xmlfmte.cxx | 2
vcl/inc/osx/a11yfocustracker.hxx | 2
64 files changed, 421 insertions(+), 438 deletions(-)
New commits:
commit 868feeed831685b4e573cc8a5a3e9ed1bceae472
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Sat Apr 16 20:40:06 2016 +0200
Fix comment
...after 9b1307f790c550d91b062cbdf1e3fe41d7e7ea4a "Avoid reserved identifiers"
Change-Id: Ieec5e6b46483f557f63fd22855484df5688dd1b4
diff --git a/sw/source/filter/xml/xmlfmte.cxx b/sw/source/filter/xml/xmlfmte.cxx
index 94340c2..f50e8e2 100644
--- a/sw/source/filter/xml/xmlfmte.cxx
+++ b/sw/source/filter/xml/xmlfmte.cxx
@@ -201,7 +201,7 @@ void SwXMLExport::ExportAutoStyles_()
if( !(getExportFlags() & SvXMLExportFlags::STYLES) )
GetTextParagraphExport()->exportUsedDeclarations();
- // exported in _ExportContent
+ // exported in ExportContent_
if( getExportFlags() & SvXMLExportFlags::CONTENT )
{
GetTextParagraphExport()->exportTrackedChanges( true );
commit 7ef97b93d7fbf41bb4d9b01f736c28cb382603c9
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Sat Apr 16 18:16:03 2016 +0200
loplugin:passstuffbyref
Change-Id: Ie10757b8026e0bdf8be40f41bb04bb02334241f3
diff --git a/connectivity/source/drivers/macab/MacabDriver.hxx b/connectivity/source/drivers/macab/MacabDriver.hxx
index f50f756..eeedac4 100644
--- a/connectivity/source/drivers/macab/MacabDriver.hxx
+++ b/connectivity/source/drivers/macab/MacabDriver.hxx
@@ -124,7 +124,7 @@ namespace connectivity
static OUString getImplementationName_Static( ) throw(::com::sun::star::uno::RuntimeException);
static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static( ) throw (::com::sun::star::uno::RuntimeException);
- ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >
+ ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const &
getComponentContext() const { return m_xContext; }
/** returns the path of our configuration settings
diff --git a/connectivity/source/drivers/macab/MacabRecords.cxx b/connectivity/source/drivers/macab/MacabRecords.cxx
index caf1db7..9ca9bca 100644
--- a/connectivity/source/drivers/macab/MacabRecords.cxx
+++ b/connectivity/source/drivers/macab/MacabRecords.cxx
@@ -1196,7 +1196,7 @@ void MacabRecords::setName(const OUString& _sName)
}
-OUString MacabRecords::getName() const
+OUString const & MacabRecords::getName() const
{
return m_sName;
}
diff --git a/connectivity/source/drivers/macab/MacabRecords.hxx b/connectivity/source/drivers/macab/MacabRecords.hxx
index 615c8ba..11e5bcc 100644
--- a/connectivity/source/drivers/macab/MacabRecords.hxx
+++ b/connectivity/source/drivers/macab/MacabRecords.hxx
@@ -88,7 +88,7 @@ namespace connectivity
MacabHeader *getHeader() const;
void setName(const OUString& _sName);
- OUString getName() const;
+ OUString const & getName() const;
MacabRecord *insertRecord(MacabRecord *_newRecord, const sal_Int32 _location);
void insertRecord(MacabRecord *_newRecord);
diff --git a/connectivity/source/drivers/macab/MacabTable.hxx b/connectivity/source/drivers/macab/MacabTable.hxx
index 6c90d78..93f2941 100644
--- a/connectivity/source/drivers/macab/MacabTable.hxx
+++ b/connectivity/source/drivers/macab/MacabTable.hxx
@@ -49,8 +49,8 @@ namespace connectivity
virtual void refreshColumns() override;
- OUString getTableName() const { return m_Name; }
- OUString getSchema() const { return m_SchemaName; }
+ OUString const & getTableName() const { return m_Name; }
+ OUString const & getSchema() const { return m_SchemaName; }
};
}
}
commit 3f4012152db815f897fbb39a618224aab53486d3
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Sat Apr 16 18:11:15 2016 +0200
loplugin:passstuffbyref
Change-Id: Ib4c63e4942acec1b02bac1a5bc387e1931eaae12
diff --git a/fpicker/source/aqua/FilterHelper.hxx b/fpicker/source/aqua/FilterHelper.hxx
index 0d465b6..67c5d5d 100644
--- a/fpicker/source/aqua/FilterHelper.hxx
+++ b/fpicker/source/aqua/FilterHelper.hxx
@@ -55,8 +55,8 @@ public:
FilterEntry( const OUString& _rTitle, const UnoFilterList& _rSubFilters );
- OUString getTitle() const { return m_sTitle; }
- OUStringList getFilterSuffixList() const { return m_sFilterSuffixList; }
+ OUString const & getTitle() const { return m_sTitle; }
+ OUStringList const & getFilterSuffixList() const { return m_sFilterSuffixList; }
/// determines if the filter has sub filter (i.e., the filter is a filter group in real)
bool hasSubFilters( ) const;
commit 06a49d7ff98f058788fe4e2263daff51a66d234c
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Sat Apr 16 18:00:33 2016 +0200
loplugin:passstuffbyref
Change-Id: I00ae9a495c69c8394f54c76d61c886229d746579
diff --git a/vcl/inc/osx/a11yfocustracker.hxx b/vcl/inc/osx/a11yfocustracker.hxx
index 79f097a..bd7a520 100644
--- a/vcl/inc/osx/a11yfocustracker.hxx
+++ b/vcl/inc/osx/a11yfocustracker.hxx
@@ -41,7 +41,7 @@ class AquaA11yFocusTracker : public rtl::Static< AquaA11yFocusTracker, AquaA11yF
public:
AquaA11yFocusTracker();
- css::uno::Reference< css::accessibility::XAccessible > getFocusedObject() { return m_xFocusedObject; };
+ css::uno::Reference< css::accessibility::XAccessible > const & getFocusedObject() { return m_xFocusedObject; };
// sets the currently focus object and notifies the FocusEventListener (if any)
void setFocusedObject(const css::uno::Reference< css::accessibility::XAccessible >& xAccessible);
commit 3a72fb6155b31679c7813d3c778f7cd26d2142b1
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Apr 15 16:59:40 2016 +0200
Avoid reserved identifier
Change-Id: I207203433b6300dda662c2c0b5c1d9e167c1c4c6
diff --git a/chart2/source/view/main/AbstractShapeFactory.cxx b/chart2/source/view/main/AbstractShapeFactory.cxx
index 777bdd4..752ff10 100644
--- a/chart2/source/view/main/AbstractShapeFactory.cxx
+++ b/chart2/source/view/main/AbstractShapeFactory.cxx
@@ -50,7 +50,7 @@ namespace chart {
namespace {
-typedef opengl::OpenglShapeFactory* (*__getOpenglShapeFactory)(void);
+typedef opengl::OpenglShapeFactory* (*getOpenglShapeFactory_)(void);
#ifndef DISABLE_DYNLOADING
@@ -96,7 +96,7 @@ AbstractShapeFactory* AbstractShapeFactory::getOrCreateShapeFactory(const uno::R
if(fn)
{
- pShapeFactory = reinterpret_cast<__getOpenglShapeFactory>(fn)();
+ pShapeFactory = reinterpret_cast<getOpenglShapeFactory_>(fn)();
pShapeFactory->setShapeFactory(xFactory);
}
}
commit b5758dfd0230a4c868c6fc689a350fe8ed6a70f6
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Apr 15 16:58:47 2016 +0200
Avoid reserved identifiers
Change-Id: I8ee75a8ba2ca579cf945a7ef2a9746a2eb13611a
diff --git a/filter/source/flash/swfexporter.cxx b/filter/source/flash/swfexporter.cxx
index 66ce949..3bdceb8 100644
--- a/filter/source/flash/swfexporter.cxx
+++ b/filter/source/flash/swfexporter.cxx
@@ -321,9 +321,9 @@ sal_uInt16 FlashExporter::exportBackgrounds( const Reference< XDrawPage >& xDraw
return ret;
if (bExportObjects)
- mpWriter->placeShape( maPagesMap[nPage].mnObjectsID, _uInt16(1), 0, 0 );
+ mpWriter->placeShape( maPagesMap[nPage].mnObjectsID, uInt16_(1), 0, 0 );
else
- mpWriter->placeShape( maPagesMap[nPage].mnBackgroundID, _uInt16(0), 0, 0 );
+ mpWriter->placeShape( maPagesMap[nPage].mnBackgroundID, uInt16_(0), 0, 0 );
mpWriter->storeTo( xOutputStream );
@@ -629,7 +629,7 @@ void FlashExporter::exportShape( const Reference< XShape >& xShape, bool bMaster
// pPageInfo->addShape( pShapeInfo );
- mpWriter->placeShape( pShapeInfo->mnID, _uInt16(nPlaceDepth++), pShapeInfo->mnX, pShapeInfo->mnY );
+ mpWriter->placeShape( pShapeInfo->mnID, uInt16_(nPlaceDepth++), pShapeInfo->mnX, pShapeInfo->mnY );
}
catch( const Exception& )
{
diff --git a/filter/source/flash/swfwriter.cxx b/filter/source/flash/swfwriter.cxx
index fbd90f7..7e58b21 100644
--- a/filter/source/flash/swfwriter.cxx
+++ b/filter/source/flash/swfwriter.cxx
@@ -163,7 +163,7 @@ void Writer::storeTo( Reference< XOutputStream > &xOutStream )
aHeader.addUI8( 0 );
aHeader.addUI8( 12 );
- aHeader.addUI16( _uInt16(mnFrames) );
+ aHeader.addUI16( uInt16_(mnFrames) );
const sal_uInt32 nSize = aHeader.Tell() + mpFontsStream->Tell() + mpMovieStream->Tell();
@@ -227,8 +227,8 @@ void Writer::placeShape( sal_uInt16 nID, sal_uInt16 nDepth, sal_Int32 x, sal_Int
// #i73264#
const basegfx::B2DHomMatrix aMatrix(basegfx::tools::createTranslateB2DHomMatrix(
- _Int16(static_cast<long>(map100thmm(x)*mnDocXScale)),
- _Int16(static_cast<long>(map100thmm(y)*mnDocYScale))));
+ Int16_(static_cast<long>(map100thmm(x)*mnDocXScale)),
+ Int16_(static_cast<long>(map100thmm(y)*mnDocYScale))));
mpTag->addMatrix( aMatrix ); // transformation matrix
endTag();
@@ -416,7 +416,7 @@ void Writer::stop()
void Writer::waitOnClick( sal_uInt16 nDepth )
{
- placeShape( _uInt16( mnPageButtonId ), nDepth, 0, 0 );
+ placeShape( uInt16_( mnPageButtonId ), nDepth, 0, 0 );
stop();
showFrame();
removeShape( nDepth );
diff --git a/filter/source/flash/swfwriter.hxx b/filter/source/flash/swfwriter.hxx
index 5f8b438..69c66a7 100644
--- a/filter/source/flash/swfwriter.hxx
+++ b/filter/source/flash/swfwriter.hxx
@@ -50,13 +50,13 @@ namespace tools
class PolyPolygon;
}
-inline sal_uInt16 _uInt16( sal_Int32 nValue )
+inline sal_uInt16 uInt16_( sal_Int32 nValue )
{
OSL_ENSURE( (nValue >= 0) && ((sal_uInt32)nValue <= 0xffff), "overflow while converting sal_Int32 to sal_uInt16" );
return (sal_uInt16)nValue;
}
-inline sal_Int16 _Int16( sal_Int32 nValue )
+inline sal_Int16 Int16_( sal_Int32 nValue )
{
OSL_ENSURE( (nValue >= -32768) && (nValue <= 32767), "overflow while converting sal_Int32 to sal_Int16" );
return (sal_Int16)nValue;
diff --git a/filter/source/flash/swfwriter1.cxx b/filter/source/flash/swfwriter1.cxx
index 05613b7..b113e31 100644
--- a/filter/source/flash/swfwriter1.cxx
+++ b/filter/source/flash/swfwriter1.cxx
@@ -114,7 +114,7 @@ void Writer::Impl_addPolygon( BitStream& rBits, const tools::Polygon& rPoly, boo
{
Point aLastPoint( rPoly[0] );
- Impl_addShapeRecordChange( rBits, _Int16(aLastPoint.X()),_Int16(aLastPoint.Y()), bFilled );
+ Impl_addShapeRecordChange( rBits, Int16_(aLastPoint.X()),Int16_(aLastPoint.Y()), bFilled );
sal_uInt16 i = 0, nSize = rPoly.GetSize();
@@ -148,7 +148,7 @@ void Writer::Impl_addPolygon( BitStream& rBits, const tools::Polygon& rPoly, boo
const Point aPolyPoint( rPoly[ i ] );
if( aPolyPoint != aLastPoint )
{
- Impl_addStraightEdgeRecord( rBits, _Int16(aPolyPoint.X() - aLastPoint.X()),_Int16(aPolyPoint.Y() - aLastPoint.Y()));
+ Impl_addStraightEdgeRecord( rBits, Int16_(aPolyPoint.X() - aLastPoint.X()),Int16_(aPolyPoint.Y() - aLastPoint.Y()));
aLastPoint = aPolyPoint;
}
}
@@ -158,7 +158,7 @@ void Writer::Impl_addPolygon( BitStream& rBits, const tools::Polygon& rPoly, boo
const Point aPolyPoint( rPoly[ 0 ] );
if( aPolyPoint != aLastPoint )
{
- Impl_addStraightEdgeRecord( rBits, _Int16(aPolyPoint.X() - aLastPoint.X()),_Int16(aPolyPoint.Y() - aLastPoint.Y()));
+ Impl_addStraightEdgeRecord( rBits, Int16_(aPolyPoint.X() - aLastPoint.X()),Int16_(aPolyPoint.Y() - aLastPoint.Y()));
}
}
}
@@ -599,7 +599,7 @@ void Writer::Impl_writeText( const Point& rPos, const OUString& rText, const lon
m.translate( double(aPt.X() / scale), double(aPt.Y()) );
m.scale( scale, scale );
- sal_Int16 nHeight = _Int16( map( Size( 0, aFont.GetFontHeight() ) ).Height() );
+ sal_Int16 nHeight = Int16_( map( Size( 0, aFont.GetFontHeight() ) ).Height() );
startTag( TAG_DEFINETEXT );
@@ -619,7 +619,7 @@ void Writer::Impl_writeText( const Point& rPos, const OUString& rText, const lon
mpTag->addUI8( 0x8c );
mpTag->addUI16( rFlashFont.getID() );
mpTag->addRGB( aTextColor );
- mpTag->addUI16( _uInt16( nHeight ) );
+ mpTag->addUI16( uInt16_( nHeight ) );
DBG_ASSERT( nLen <= 127, "TODO: handle text with more than 127 characters" );
@@ -643,7 +643,7 @@ void Writer::Impl_writeText( const Point& rPos, const OUString& rText, const lon
}
aBits.writeUB( rFlashFont.getGlyph(rText[i],mpVDev), nGlyphBits );
- aBits.writeSB( _Int16(map( Size( (long)( nAdvance / scale ), 0 ) ).Width() ), nAdvanceBits );
+ aBits.writeSB( Int16_(map( Size( (long)( nAdvance / scale ), 0 ) ).Width() ), nAdvanceBits );
}
mpTag->addBits( aBits );
@@ -960,8 +960,8 @@ void Writer::Impl_writeBmp( sal_uInt16 nBitmapId, sal_uInt32 width, sal_uInt32 h
mpTag->addUI16( nBitmapId );
mpTag->addUI8( 5 );
- mpTag->addUI16( _uInt16(width) );
- mpTag->addUI16( _uInt16(height) );
+ mpTag->addUI16( uInt16_(width) );
+ mpTag->addUI16( uInt16_(height) );
mpTag->Write( pCompressed, compressed_size );
@@ -1820,7 +1820,7 @@ void Writer::Impl_addStraightLine( BitStream& rBits, Point& rLastPoint,
{
Point aPoint( FRound(P2x), FRound(P2y) );
- Impl_addStraightEdgeRecord( rBits, _Int16(aPoint.X() - rLastPoint.X()),_Int16(aPoint.Y() - rLastPoint.Y()));
+ Impl_addStraightEdgeRecord( rBits, Int16_(aPoint.X() - rLastPoint.X()),Int16_(aPoint.Y() - rLastPoint.Y()));
rLastPoint = aPoint;
}
@@ -1835,8 +1835,8 @@ void Writer::Impl_addQuadBezier( BitStream& rBits, Point& rLastPoint,
Point aAnchorPoint( FRound(P3x), FRound(P3y) );
Impl_addCurvedEdgeRecord( rBits,
- _Int16(aControlPoint.X() - rLastPoint.X()),_Int16(aControlPoint.Y() - rLastPoint.Y()),
- _Int16(aAnchorPoint.X() - aControlPoint.X()),_Int16(aAnchorPoint.Y() - aControlPoint.Y()) );
+ Int16_(aControlPoint.X() - rLastPoint.X()),Int16_(aControlPoint.Y() - rLastPoint.Y()),
+ Int16_(aAnchorPoint.X() - aControlPoint.X()),Int16_(aAnchorPoint.Y() - aControlPoint.Y()) );
rLastPoint = aAnchorPoint;
}
diff --git a/filter/source/flash/swfwriter2.cxx b/filter/source/flash/swfwriter2.cxx
index ec523c5..3e06262 100644
--- a/filter/source/flash/swfwriter2.cxx
+++ b/filter/source/flash/swfwriter2.cxx
@@ -140,7 +140,7 @@ void Tag::write( SvStream &out )
{
bool bLarge = nSz > 62;
- sal_uInt16 nCode = ( mnTagId << 6 ) | ( bLarge ? 0x3f : _uInt16(nSz) );
+ sal_uInt16 nCode = ( mnTagId << 6 ) | ( bLarge ? 0x3f : uInt16_(nSz) );
out.WriteUChar( nCode );
out.WriteUChar( nCode >> 8 );
@@ -367,7 +367,7 @@ void Sprite::write( SvStream& out )
Tag aTag( TAG_DEFINESPRITE );
aTag.addUI16( mnId );
- aTag.addUI16( _uInt16( mnFrames ) );
+ aTag.addUI16( uInt16_( mnFrames ) );
aTag.addStream( aTmp );
aTag.write( out );
}
@@ -433,7 +433,7 @@ sal_uInt16 FlashFont::getGlyph( sal_uInt16 nChar, VirtualDevice* pVDev )
tools::PolyPolygon aPolyPoly;
pVDev->GetTextOutline( aPolyPoly, OUString(sal_Unicode(nChar)) );
- maGlyphOffsets.push_back( _uInt16( maGlyphData.getOffset() ) );
+ maGlyphOffsets.push_back( uInt16_( maGlyphData.getOffset() ) );
// Number of fill and line index bits set to 1
maGlyphData.writeUB( 0x11, 8 );
@@ -474,7 +474,7 @@ void FlashFont::write( SvStream& out )
aTag.addUI16( mnId );
- sal_uInt16 nGlyphs = _uInt16( maGlyphOffsets.size() );
+ sal_uInt16 nGlyphs = uInt16_( maGlyphOffsets.size() );
sal_uInt16 nOffset = nGlyphs * sizeof( sal_uInt16 );
for(vector< sal_uInt16 >::iterator i = maGlyphOffsets.begin(); i != maGlyphOffsets.end(); ++i)
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index 43b409b..8b2c1c3 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -6870,7 +6870,7 @@ css::uno::Reference < css::embed::XEmbeddedObject > SvxMSDffManager::CheckForCo
sStarName = OUString::createFromAscii( pName );
else if ( nConvertFlags )
{
- static struct _ObjImpType
+ static struct ObjImpType
{
sal_uInt32 nFlag;
const char* pFactoryNm;
@@ -6896,7 +6896,7 @@ css::uno::Reference < css::embed::XEmbeddedObject > SvxMSDffManager::CheckForCo
0, 0, 0, 0, 0, 0, 0, 0 }
};
- for( const _ObjImpType* pArr = aArr; pArr->nFlag; ++pArr )
+ for( const ObjImpType* pArr = aArr; pArr->nFlag; ++pArr )
{
if( nConvertFlags & pArr->nFlag )
{
diff --git a/filter/source/msfilter/msoleexp.cxx b/filter/source/msfilter/msoleexp.cxx
index 54c6a86..564058d9 100644
--- a/filter/source/msfilter/msoleexp.cxx
+++ b/filter/source/msfilter/msoleexp.cxx
@@ -124,11 +124,11 @@ void SvxMSExportOLEObjects::ExportOLEObject( svt::EmbeddedObjectRef& rObj, SotSt
SvGlobalName aObjName( rObj->getClassID() );
std::shared_ptr<const SfxFilter> pExpFilter;
{
- static struct _ObjExpType {
+ static struct ObjExpType {
sal_uInt32 nFlag;
const char* pFilterNm;
// GlobalNameId
- struct _GlobalNameIds {
+ struct GlobalNameIds {
sal_uInt32 n1;
sal_uInt16 n2, n3;
sal_uInt8 b8, b9, b10, b11, b12, b13, b14, b15;
@@ -159,11 +159,11 @@ void SvxMSExportOLEObjects::ExportOLEObject( svt::EmbeddedObjectRef& rObj, SotSt
{SO3_SDRAW_CLASSID_60}, {SO3_SDRAW_CLASSID_50}}}
};
- for( const _ObjExpType* pArr = aArr; !pExpFilter && ( pArr->nFlag != 0xffff ); ++pArr )
+ for( const ObjExpType* pArr = aArr; !pExpFilter && ( pArr->nFlag != 0xffff ); ++pArr )
{
for ( int n = 0; n < 4; ++n )
{
- const _ObjExpType::_GlobalNameIds& rId = pArr->aGlNmIds[ n ];
+ const ObjExpType::GlobalNameIds& rId = pArr->aGlNmIds[ n ];
SvGlobalName aGlbNm( rId.n1, rId.n2, rId.n3,
rId.b8, rId.b9, rId.b10, rId.b11,
rId.b12, rId.b13, rId.b14, rId.b15 );
diff --git a/filter/source/xsltdialog/xmlfilterjar.cxx b/filter/source/xsltdialog/xmlfilterjar.cxx
index effc2fb..6c0876f 100644
--- a/filter/source/xsltdialog/xmlfilterjar.cxx
+++ b/filter/source/xsltdialog/xmlfilterjar.cxx
@@ -101,7 +101,7 @@ static Reference< XInterface > addFolder( Reference< XInterface >& xRootFolder,
return xFolder;
}
-static void _addFile( Reference< XInterface >& xRootFolder, Reference< XSingleServiceFactory >& xFactory, Reference< XInputStream >& xInput, const OUString& aName ) throw( Exception )
+static void addFile_( Reference< XInterface >& xRootFolder, Reference< XSingleServiceFactory >& xFactory, Reference< XInputStream >& xInput, const OUString& aName ) throw( Exception )
{
Reference< XActiveDataSink > xSink( xFactory->createInstance(), UNO_QUERY );
Reference< XUnoTunnel > xTunnel( xSink, UNO_QUERY );
@@ -133,7 +133,7 @@ void XMLFilterJarHelper::addFile( Reference< XInterface > xRootFolder, Reference
SvFileStream* pStream = new SvFileStream(aFileURL, StreamMode::READ );
Reference< XInputStream > xInput( new utl::OSeekableInputStreamWrapper( pStream, true ) );
- _addFile( xRootFolder, xFactory, xInput, aName );
+ addFile_( xRootFolder, xFactory, xInput, aName );
}
}
@@ -215,7 +215,7 @@ bool XMLFilterJarHelper::savePackage( const OUString& rPackageURL, const XMLFilt
Reference< XInputStream > XIS( new utl::OSeekableInputStreamWrapper( new SvFileStream(aTempFileURL, StreamMode::READ ), true ) );
OUString szTypeDetection( "TypeDetection.xcu" );
- _addFile( xRootFolder, xFactory, XIS, szTypeDetection );
+ addFile_( xRootFolder, xFactory, XIS, szTypeDetection );
Reference< XChangesBatch > xBatch( xIfc, UNO_QUERY );
if( xBatch.is() )
commit d1379416c6915dd48fa5e350460215aa3d3e6ce8
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Apr 15 15:54:06 2016 +0200
Avoid reserved identifiers
Change-Id: Ie20bd7a9b3824ce2208d23ded2eae4959dff7bc4
diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index d2577e6..0078611 100644
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -3263,14 +3263,9 @@ void FmXGridCell::setLock(sal_Bool _bLock) throw( RuntimeException, std::excepti
}
-void SAL_CALL FmXGridCell::setPosSize( ::sal_Int32 _XX, ::sal_Int32 _Y, ::sal_Int32 _Width, ::sal_Int32 _Height, ::sal_Int16 _Flags ) throw (RuntimeException, std::exception)
+void SAL_CALL FmXGridCell::setPosSize( ::sal_Int32, ::sal_Int32, ::sal_Int32, ::sal_Int32, ::sal_Int16 ) throw (RuntimeException, std::exception)
{
OSL_FAIL( "FmXGridCell::setPosSize: not implemented" );
- (void)_XX;
- (void)_Y;
- (void)_Width;
- (void)_Height;
- (void)_Flags;
// not allowed to tamper with this for a grid cell
}
@@ -3282,18 +3277,16 @@ awt::Rectangle SAL_CALL FmXGridCell::getPosSize( ) throw (RuntimeException, std
}
-void SAL_CALL FmXGridCell::setVisible( sal_Bool _Visible ) throw (RuntimeException, std::exception)
+void SAL_CALL FmXGridCell::setVisible( sal_Bool ) throw (RuntimeException, std::exception)
{
OSL_FAIL( "FmXGridCell::setVisible: not implemented" );
- (void)_Visible;
// not allowed to tamper with this for a grid cell
}
-void SAL_CALL FmXGridCell::setEnable( sal_Bool _Enable ) throw (RuntimeException, std::exception)
+void SAL_CALL FmXGridCell::setEnable( sal_Bool ) throw (RuntimeException, std::exception)
{
OSL_FAIL( "FmXGridCell::setEnable: not implemented" );
- (void)_Enable;
// not allowed to tamper with this for a grid cell
}
@@ -3769,15 +3762,15 @@ void SAL_CALL FmXEditCell::setMaxTextLen( sal_Int16 nLen ) throw( RuntimeExcepti
}
-void SAL_CALL FmXEditCell::addChangeListener( const Reference< form::XChangeListener >& _Listener ) throw (RuntimeException, std::exception)
+void SAL_CALL FmXEditCell::addChangeListener( const Reference< form::XChangeListener >& Listener ) throw (RuntimeException, std::exception)
{
- m_aChangeListeners.addInterface( _Listener );
+ m_aChangeListeners.addInterface( Listener );
}
-void SAL_CALL FmXEditCell::removeChangeListener( const Reference< form::XChangeListener >& _Listener ) throw (RuntimeException, std::exception)
+void SAL_CALL FmXEditCell::removeChangeListener( const Reference< form::XChangeListener >& Listener ) throw (RuntimeException, std::exception)
{
- m_aChangeListeners.removeInterface( _Listener );
+ m_aChangeListeners.removeInterface( Listener );
}
@@ -3926,32 +3919,32 @@ void SAL_CALL FmXCheckBoxCell::enableTriState( sal_Bool b ) throw( RuntimeExcept
}
-void SAL_CALL FmXCheckBoxCell::addActionListener( const Reference< awt::XActionListener >& _Listener ) throw (RuntimeException, std::exception)
+void SAL_CALL FmXCheckBoxCell::addActionListener( const Reference< awt::XActionListener >& Listener ) throw (RuntimeException, std::exception)
{
- m_aActionListeners.addInterface( _Listener );
+ m_aActionListeners.addInterface( Listener );
}
-void SAL_CALL FmXCheckBoxCell::removeActionListener( const Reference< awt::XActionListener >& _Listener ) throw (RuntimeException, std::exception)
+void SAL_CALL FmXCheckBoxCell::removeActionListener( const Reference< awt::XActionListener >& Listener ) throw (RuntimeException, std::exception)
{
- m_aActionListeners.removeInterface( _Listener );
+ m_aActionListeners.removeInterface( Listener );
}
-void SAL_CALL FmXCheckBoxCell::setLabel( const OUString& _Label ) throw (RuntimeException, std::exception)
+void SAL_CALL FmXCheckBoxCell::setLabel( const OUString& Label ) throw (RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
if ( m_pColumn )
{
DbGridControl& rGrid( m_pColumn->GetParent() );
- rGrid.SetColumnTitle( rGrid.GetColumnId( m_pColumn->GetFieldPos() ), _Label );
+ rGrid.SetColumnTitle( rGrid.GetColumnId( m_pColumn->GetFieldPos() ), Label );
}
}
-void SAL_CALL FmXCheckBoxCell::setActionCommand( const OUString& _Command ) throw (RuntimeException, std::exception)
+void SAL_CALL FmXCheckBoxCell::setActionCommand( const OUString& Command ) throw (RuntimeException, std::exception)
{
- m_aActionCommand = _Command;
+ m_aActionCommand = Command;
}
@@ -4409,37 +4402,37 @@ void SAL_CALL FmXComboBoxCell::removeActionListener(const Reference< awt::XActio
}
-void SAL_CALL FmXComboBoxCell::addItem( const OUString& _Item, sal_Int16 _Pos ) throw( RuntimeException, std::exception )
+void SAL_CALL FmXComboBoxCell::addItem( const OUString& Item, sal_Int16 Pos ) throw( RuntimeException, std::exception )
{
::osl::MutexGuard aGuard( m_aMutex );
if ( m_pComboBox )
- m_pComboBox->InsertEntry( _Item, _Pos );
+ m_pComboBox->InsertEntry( Item, Pos );
}
-void SAL_CALL FmXComboBoxCell::addItems( const Sequence< OUString >& _Items, sal_Int16 _Pos ) throw( RuntimeException, std::exception )
+void SAL_CALL FmXComboBoxCell::addItems( const Sequence< OUString >& Items, sal_Int16 Pos ) throw( RuntimeException, std::exception )
{
::osl::MutexGuard aGuard( m_aMutex );
if ( m_pComboBox )
{
- sal_uInt16 nP = _Pos;
- for ( sal_Int32 n = 0; n < _Items.getLength(); n++ )
+ sal_uInt16 nP = Pos;
+ for ( sal_Int32 n = 0; n < Items.getLength(); n++ )
{
- m_pComboBox->InsertEntry( _Items.getConstArray()[n], nP );
- if ( _Pos != -1 )
+ m_pComboBox->InsertEntry( Items.getConstArray()[n], nP );
+ if ( Pos != -1 )
nP++;
}
}
}
-void SAL_CALL FmXComboBoxCell::removeItems( sal_Int16 _Pos, sal_Int16 _Count ) throw( RuntimeException, std::exception )
+void SAL_CALL FmXComboBoxCell::removeItems( sal_Int16 Pos, sal_Int16 Count ) throw( RuntimeException, std::exception )
{
::osl::MutexGuard aGuard( m_aMutex );
if ( m_pComboBox )
{
- for ( sal_uInt16 n = _Count; n; )
- m_pComboBox->RemoveEntryAt( _Pos + (--n) );
+ for ( sal_uInt16 n = Count; n; )
+ m_pComboBox->RemoveEntryAt( Pos + (--n) );
}
}
@@ -4451,10 +4444,10 @@ sal_Int16 SAL_CALL FmXComboBoxCell::getItemCount() throw( RuntimeException, std:
}
-OUString SAL_CALL FmXComboBoxCell::getItem( sal_Int16 _Pos ) throw( RuntimeException, std::exception )
+OUString SAL_CALL FmXComboBoxCell::getItem( sal_Int16 Pos ) throw( RuntimeException, std::exception )
{
::osl::MutexGuard aGuard( m_aMutex );
- return m_pComboBox ? OUString(m_pComboBox->GetEntry(_Pos)) : OUString();
+ return m_pComboBox ? OUString(m_pComboBox->GetEntry(Pos)) : OUString();
}
Sequence< OUString > SAL_CALL FmXComboBoxCell::getItems() throw( RuntimeException, std::exception )
diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx
index 97cde24..29d62bc 100644
--- a/svx/source/form/filtnav.cxx
+++ b/svx/source/form/filtnav.cxx
@@ -261,9 +261,9 @@ public:
virtual void SAL_CALL disposing(const EventObject& Source) throw( RuntimeException, std::exception ) override;
// XFilterControllerListener
- virtual void SAL_CALL predicateExpressionChanged( const FilterEvent& _Event ) throw (RuntimeException, std::exception) override;
- virtual void SAL_CALL disjunctiveTermRemoved( const FilterEvent& _Event ) throw (RuntimeException, std::exception) override;
- virtual void SAL_CALL disjunctiveTermAdded( const FilterEvent& _Event ) throw (RuntimeException, std::exception) override;
+ virtual void SAL_CALL predicateExpressionChanged( const FilterEvent& Event ) throw (RuntimeException, std::exception) override;
+ virtual void SAL_CALL disjunctiveTermRemoved( const FilterEvent& Event ) throw (RuntimeException, std::exception) override;
+ virtual void SAL_CALL disjunctiveTermAdded( const FilterEvent& Event ) throw (RuntimeException, std::exception) override;
// helpers
void dispose() throw( RuntimeException );
@@ -373,7 +373,7 @@ namespace
// XFilterControllerListener
-void FmFilterAdapter::predicateExpressionChanged( const FilterEvent& _Event ) throw( RuntimeException, std::exception )
+void FmFilterAdapter::predicateExpressionChanged( const FilterEvent& Event ) throw( RuntimeException, std::exception )
{
SolarMutexGuard aGuard;
@@ -381,8 +381,8 @@ void FmFilterAdapter::predicateExpressionChanged( const FilterEvent& _Event ) th
return;
// the controller which sent the event
- Reference< XFormController > xController( _Event.Source, UNO_QUERY_THROW );
- Reference< XFilterController > xFilterController( _Event.Source, UNO_QUERY_THROW );
+ Reference< XFormController > xController( Event.Source, UNO_QUERY_THROW );
+ Reference< XFilterController > xFilterController( Event.Source, UNO_QUERY_THROW );
Reference< XForm > xForm( xController->getModel(), UNO_QUERY_THROW );
FmFormItem* pFormItem = m_pModel->Find( m_pModel->m_aChildren, xForm );
@@ -394,12 +394,12 @@ void FmFilterAdapter::predicateExpressionChanged( const FilterEvent& _Event ) th
FmFilterData* pData = pFormItem->GetChildren()[nActiveTerm];
FmFilterItems& rFilter = dynamic_cast<FmFilterItems&>(*pData);
- FmFilterItem* pFilterItem = rFilter.Find( _Event.FilterComponent );
+ FmFilterItem* pFilterItem = rFilter.Find( Event.FilterComponent );
if ( pFilterItem )
{
- if ( !_Event.PredicateExpression.isEmpty())
+ if ( !Event.PredicateExpression.isEmpty())
{
- pFilterItem->SetText( _Event.PredicateExpression );
+ pFilterItem->SetText( Event.PredicateExpression );
// UI benachrichtigen
FmFilterTextChangedHint aChangeHint(pFilterItem);
m_pModel->Broadcast( aChangeHint );
@@ -413,9 +413,9 @@ void FmFilterAdapter::predicateExpressionChanged( const FilterEvent& _Event ) th
else
{
// searching the component by field name
- OUString aFieldName( lcl_getLabelName_nothrow( xFilterController->getFilterComponent( _Event.FilterComponent ) ) );
+ OUString aFieldName( lcl_getLabelName_nothrow( xFilterController->getFilterComponent( Event.FilterComponent ) ) );
- pFilterItem = new FmFilterItem(&rFilter, aFieldName, _Event.PredicateExpression, _Event.FilterComponent);
+ pFilterItem = new FmFilterItem(&rFilter, aFieldName, Event.PredicateExpression, Event.FilterComponent);
m_pModel->Insert(rFilter.GetChildren().end(), pFilterItem);
}
@@ -424,12 +424,12 @@ void FmFilterAdapter::predicateExpressionChanged( const FilterEvent& _Event ) th
}
-void SAL_CALL FmFilterAdapter::disjunctiveTermRemoved( const FilterEvent& _Event ) throw (RuntimeException, std::exception)
+void SAL_CALL FmFilterAdapter::disjunctiveTermRemoved( const FilterEvent& Event ) throw (RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
- Reference< XFormController > xController( _Event.Source, UNO_QUERY_THROW );
- Reference< XFilterController > xFilterController( _Event.Source, UNO_QUERY_THROW );
+ Reference< XFormController > xController( Event.Source, UNO_QUERY_THROW );
+ Reference< XFilterController > xFilterController( Event.Source, UNO_QUERY_THROW );
Reference< XForm > xForm( xController->getModel(), UNO_QUERY_THROW );
FmFormItem* pFormItem = m_pModel->Find( m_pModel->m_aChildren, xForm );
@@ -438,13 +438,13 @@ void SAL_CALL FmFilterAdapter::disjunctiveTermRemoved( const FilterEvent& _Event
return;
::std::vector< FmFilterData* >& rTermItems = pFormItem->GetChildren();
- const bool bValidIndex = ( _Event.DisjunctiveTerm >= 0 ) && ( (size_t)_Event.DisjunctiveTerm < rTermItems.size() );
+ const bool bValidIndex = ( Event.DisjunctiveTerm >= 0 ) && ( (size_t)Event.DisjunctiveTerm < rTermItems.size() );
OSL_ENSURE( bValidIndex, "FmFilterAdapter::disjunctiveTermRemoved: invalid term index!" );
if ( !bValidIndex )
return;
// if the first term was removed, then the to-be first term needs its text updated
- if ( _Event.DisjunctiveTerm == 0 )
+ if ( Event.DisjunctiveTerm == 0 )
{
rTermItems[1]->SetText( SVX_RESSTR(RID_STR_FILTER_FILTER_FOR));
FmFilterTextChangedHint aChangeHint( rTermItems[1] );
@@ -452,19 +452,19 @@ void SAL_CALL FmFilterAdapter::disjunctiveTermRemoved( const FilterEvent& _Event
}
// finally remove the entry from the model
- m_pModel->Remove( rTermItems.begin() + _Event.DisjunctiveTerm );
+ m_pModel->Remove( rTermItems.begin() + Event.DisjunctiveTerm );
// ensure there's one empty term in the filter, just in case the currently removed one was the last empty one
m_pModel->EnsureEmptyFilterRows( *pFormItem );
}
-void SAL_CALL FmFilterAdapter::disjunctiveTermAdded( const FilterEvent& _Event ) throw (RuntimeException, std::exception)
+void SAL_CALL FmFilterAdapter::disjunctiveTermAdded( const FilterEvent& Event ) throw (RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
- Reference< XFormController > xController( _Event.Source, UNO_QUERY_THROW );
- Reference< XFilterController > xFilterController( _Event.Source, UNO_QUERY_THROW );
+ Reference< XFormController > xController( Event.Source, UNO_QUERY_THROW );
+ Reference< XFilterController > xFilterController( Event.Source, UNO_QUERY_THROW );
Reference< XForm > xForm( xController->getModel(), UNO_QUERY_THROW );
FmFormItem* pFormItem = m_pModel->Find( m_pModel->m_aChildren, xForm );
@@ -472,7 +472,7 @@ void SAL_CALL FmFilterAdapter::disjunctiveTermAdded( const FilterEvent& _Event )
if ( !pFormItem )
return;
- const sal_Int32 nInsertPos = _Event.DisjunctiveTerm;
+ const sal_Int32 nInsertPos = Event.DisjunctiveTerm;
bool bValidIndex = ( nInsertPos >= 0 ) && ( (size_t)nInsertPos <= pFormItem->GetChildren().size() );
if ( !bValidIndex )
{
diff --git a/svx/source/form/fmtools.cxx b/svx/source/form/fmtools.cxx
index 897b3c7..daa77a3 100644
--- a/svx/source/form/fmtools.cxx
+++ b/svx/source/form/fmtools.cxx
@@ -317,13 +317,13 @@ FmXDisposeMultiplexer::~FmXDisposeMultiplexer()
// css::lang::XEventListener
-void FmXDisposeMultiplexer::disposing(const css::lang::EventObject& _Source) throw( RuntimeException, std::exception )
+void FmXDisposeMultiplexer::disposing(const css::lang::EventObject& Source) throw( RuntimeException, std::exception )
{
Reference< css::lang::XEventListener> xPreventDelete(this);
if (m_pListener)
{
- m_pListener->disposing(_Source, m_nId);
+ m_pListener->disposing(Source, m_nId);
m_pListener->setAdapter(nullptr);
m_pListener = nullptr;
}
diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx
index a20630e..a2e1e1c 100644
--- a/svx/source/form/fmvwimp.cxx
+++ b/svx/source/form/fmvwimp.cxx
@@ -246,11 +246,11 @@ Any SAL_CALL FormViewPageWindowAdapter::getByIndex(sal_Int32 nIndex) throw( Inde
return aElement;
}
-void SAL_CALL FormViewPageWindowAdapter::makeVisible( const Reference< XControl >& _Control ) throw (RuntimeException, std::exception)
+void SAL_CALL FormViewPageWindowAdapter::makeVisible( const Reference< XControl >& Control ) throw (RuntimeException, std::exception)
{
SolarMutexGuard aSolarGuard;
- Reference< XWindow > xWindow( _Control, UNO_QUERY );
+ Reference< XWindow > xWindow( Control, UNO_QUERY );
if ( xWindow.is() && m_pViewImpl->getView() && m_pWindow )
{
awt::Rectangle aRect = xWindow->getPosSize();
diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx
index 8b09b05..4629ac9 100644
--- a/svx/source/form/formcontroller.cxx
+++ b/svx/source/form/formcontroller.cxx
@@ -888,15 +888,15 @@ void FormController::fillProperties(
// XFilterController
-void SAL_CALL FormController::addFilterControllerListener( const Reference< XFilterControllerListener >& _Listener ) throw( RuntimeException, std::exception )
+void SAL_CALL FormController::addFilterControllerListener( const Reference< XFilterControllerListener >& Listener ) throw( RuntimeException, std::exception )
{
- m_aFilterListeners.addInterface( _Listener );
+ m_aFilterListeners.addInterface( Listener );
}
-void SAL_CALL FormController::removeFilterControllerListener( const Reference< XFilterControllerListener >& _Listener ) throw( RuntimeException, std::exception )
+void SAL_CALL FormController::removeFilterControllerListener( const Reference< XFilterControllerListener >& Listener ) throw( RuntimeException, std::exception )
{
- m_aFilterListeners.removeInterface( _Listener );
+ m_aFilterListeners.removeInterface( Listener );
}
@@ -918,34 +918,34 @@ void SAL_CALL FormController::removeFilterControllerListener( const Reference< X
}
-void SAL_CALL FormController::setPredicateExpression( ::sal_Int32 _Component, ::sal_Int32 _Term, const OUString& _PredicateExpression ) throw( RuntimeException, IndexOutOfBoundsException, std::exception )
+void SAL_CALL FormController::setPredicateExpression( ::sal_Int32 Component, ::sal_Int32 Term, const OUString& PredicateExpression ) throw( RuntimeException, IndexOutOfBoundsException, std::exception )
{
::osl::MutexGuard aGuard( m_aMutex );
impl_checkDisposed_throw();
- if ( ( _Component < 0 ) || ( _Component >= getFilterComponents() ) || ( _Term < 0 ) || ( _Term >= getDisjunctiveTerms() ) )
+ if ( ( Component < 0 ) || ( Component >= getFilterComponents() ) || ( Term < 0 ) || ( Term >= getDisjunctiveTerms() ) )
throw IndexOutOfBoundsException( OUString(), *this );
- Reference< XTextComponent > xText( m_aFilterComponents[ _Component ] );
- xText->setText( _PredicateExpression );
+ Reference< XTextComponent > xText( m_aFilterComponents[ Component ] );
+ xText->setText( PredicateExpression );
- FmFilterRow& rFilterRow = m_aFilterRows[ _Term ];
- if ( !_PredicateExpression.isEmpty() )
- rFilterRow[ xText ] = _PredicateExpression;
+ FmFilterRow& rFilterRow = m_aFilterRows[ Term ];
+ if ( !PredicateExpression.isEmpty() )
+ rFilterRow[ xText ] = PredicateExpression;
else
rFilterRow.erase( xText );
}
-Reference< XControl > FormController::getFilterComponent( ::sal_Int32 _Component ) throw( RuntimeException, IndexOutOfBoundsException, std::exception )
+Reference< XControl > FormController::getFilterComponent( ::sal_Int32 Component ) throw( RuntimeException, IndexOutOfBoundsException, std::exception )
{
::osl::MutexGuard aGuard( m_aMutex );
impl_checkDisposed_throw();
- if ( ( _Component < 0 ) || ( _Component >= getFilterComponents() ) )
+ if ( ( Component < 0 ) || ( Component >= getFilterComponents() ) )
throw IndexOutOfBoundsException( OUString(), *this );
- return Reference< XControl >( m_aFilterComponents[ _Component ], UNO_QUERY );
+ return Reference< XControl >( m_aFilterComponents[ Component ], UNO_QUERY );
}
@@ -982,17 +982,17 @@ Sequence< Sequence< OUString > > FormController::getPredicateExpressions() throw
}
-void SAL_CALL FormController::removeDisjunctiveTerm( ::sal_Int32 _Term ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+void SAL_CALL FormController::removeDisjunctiveTerm( ::sal_Int32 Term ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
{
// SYNCHRONIZED -->
::osl::ClearableMutexGuard aGuard( m_aMutex );
impl_checkDisposed_throw();
- if ( ( _Term < 0 ) || ( _Term >= getDisjunctiveTerms() ) )
+ if ( ( Term < 0 ) || ( Term >= getDisjunctiveTerms() ) )
throw IndexOutOfBoundsException( OUString(), *this );
// if the to-be-deleted row is our current row, we need to shift
- if ( _Term == m_nCurrentFilterPosition )
+ if ( Term == m_nCurrentFilterPosition )
{
if ( m_nCurrentFilterPosition < sal_Int32( m_aFilterRows.size() - 1 ) )
++m_nCurrentFilterPosition;
@@ -1000,11 +1000,11 @@ void SAL_CALL FormController::removeDisjunctiveTerm( ::sal_Int32 _Term ) throw (
--m_nCurrentFilterPosition;
}
- FmFilterRows::iterator pos = m_aFilterRows.begin() + _Term;
+ FmFilterRows::iterator pos = m_aFilterRows.begin() + Term;
m_aFilterRows.erase( pos );
// adjust m_nCurrentFilterPosition if the removed row preceded it
- if ( _Term < m_nCurrentFilterPosition )
+ if ( Term < m_nCurrentFilterPosition )
--m_nCurrentFilterPosition;
SAL_WARN_IF( !( ( m_nCurrentFilterPosition < 0 ) != ( m_aFilterRows.empty() ) ),
@@ -1015,7 +1015,7 @@ void SAL_CALL FormController::removeDisjunctiveTerm( ::sal_Int32 _Term ) throw (
FilterEvent aEvent;
aEvent.Source = *this;
- aEvent.DisjunctiveTerm = _Term;
+ aEvent.DisjunctiveTerm = Term;
aGuard.clear();
// <-- SYNCHRONIZED
@@ -1043,18 +1043,18 @@ void SAL_CALL FormController::appendEmptyDisjunctiveTerm() throw (RuntimeExcepti
}
-void SAL_CALL FormController::setActiveTerm( ::sal_Int32 _ActiveTerm ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
+void SAL_CALL FormController::setActiveTerm( ::sal_Int32 ActiveTerm ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
{
::osl::MutexGuard aGuard( m_aMutex );
impl_checkDisposed_throw();
- if ( ( _ActiveTerm < 0 ) || ( _ActiveTerm >= getDisjunctiveTerms() ) )
+ if ( ( ActiveTerm < 0 ) || ( ActiveTerm >= getDisjunctiveTerms() ) )
throw IndexOutOfBoundsException( OUString(), *this );
- if ( _ActiveTerm == getActiveTerm() )
+ if ( ActiveTerm == getActiveTerm() )
return;
- m_nCurrentFilterPosition = _ActiveTerm;
+ m_nCurrentFilterPosition = ActiveTerm;
impl_setTextOnAllFilter_throw();
}
@@ -2965,17 +2965,17 @@ void SAL_CALL FormController::removeActivateListener(const Reference< XFormContr
}
-void SAL_CALL FormController::addChildController( const Reference< XFormController >& _ChildController ) throw( RuntimeException, IllegalArgumentException, std::exception )
+void SAL_CALL FormController::addChildController( const Reference< XFormController >& ChildController ) throw( RuntimeException, IllegalArgumentException, std::exception )
{
::osl::MutexGuard aGuard( m_aMutex );
impl_checkDisposed_throw();
- if ( !_ChildController.is() )
+ if ( !ChildController.is() )
throw IllegalArgumentException( OUString(), *this, 1 );
// TODO: (localized) error message
// the parent of our (to-be-)child must be our own model
- Reference< XFormComponent > xFormOfChild( _ChildController->getModel(), UNO_QUERY );
+ Reference< XFormComponent > xFormOfChild( ChildController->getModel(), UNO_QUERY );
if ( !xFormOfChild.is() )
throw IllegalArgumentException( OUString(), *this, 1 );
// TODO: (localized) error message
@@ -2984,8 +2984,8 @@ void SAL_CALL FormController::addChildController( const Reference< XFormControll
throw IllegalArgumentException( OUString(), *this, 1 );
// TODO: (localized) error message
- m_aChildren.push_back( _ChildController );
- _ChildController->setParent( *this );
+ m_aChildren.push_back( ChildController );
+ ChildController->setParent( *this );
// search the position of the model within the form
sal_uInt32 nPos = m_xModelAsIndex->getCount();
@@ -2995,7 +2995,7 @@ void SAL_CALL FormController::addChildController( const Reference< XFormControll
m_xModelAsIndex->getByIndex(--nPos) >>= xTemp;
if ( xFormOfChild == xTemp )
{
- m_xModelAsManager->attach( nPos, Reference<XInterface>( _ChildController, UNO_QUERY ), makeAny( _ChildController) );
+ m_xModelAsManager->attach( nPos, Reference<XInterface>( ChildController, UNO_QUERY ), makeAny( ChildController) );
break;
}
}
@@ -4027,11 +4027,11 @@ sal_Bool SAL_CALL FormController::confirmDelete(const RowChangeEvent& aEvent) th
}
-void SAL_CALL FormController::invalidateFeatures( const Sequence< ::sal_Int16 >& _Features ) throw (RuntimeException, std::exception)
+void SAL_CALL FormController::invalidateFeatures( const Sequence< ::sal_Int16 >& Features ) throw (RuntimeException, std::exception)
{
::osl::MutexGuard aGuard( m_aMutex );
// for now, just copy the ids of the features, because ....
- ::std::copy( _Features.begin(), _Features.end(),
+ ::std::copy( Features.begin(), Features.end(),
::std::insert_iterator< ::std::set< sal_Int16 > >( m_aInvalidFeatures, m_aInvalidFeatures.begin() )
);
diff --git a/svx/source/form/formcontrolling.cxx b/svx/source/form/formcontrolling.cxx
index da0d42d..2d93b63 100644
--- a/svx/source/form/formcontrolling.cxx
+++ b/svx/source/form/formcontrolling.cxx
@@ -155,9 +155,9 @@ namespace svx
struct FormFeatureToSlotId : public ::std::unary_function< sal_Int16, sal_Int32 >
{
- sal_Int32 operator()( sal_Int16 _FormFeature )
+ sal_Int32 operator()( sal_Int16 FormFeature )
{
- return FeatureSlotTranslation::getSlotIdForFormFeature( _FormFeature );
+ return FeatureSlotTranslation::getSlotIdForFormFeature( FormFeature );
}
};
}
@@ -385,16 +385,16 @@ namespace svx
}
- void SAL_CALL FormControllerHelper::invalidateFeatures( const Sequence< ::sal_Int16 >& _Features ) throw (RuntimeException, std::exception)
+ void SAL_CALL FormControllerHelper::invalidateFeatures( const Sequence< ::sal_Int16 >& Features ) throw (RuntimeException, std::exception)
{
if ( !m_pInvalidationCallback )
// nobody's interested in ...
return;
- ::std::vector< sal_Int32 > aFeatures( _Features.getLength() );
+ ::std::vector< sal_Int32 > aFeatures( Features.getLength() );
::std::transform(
- _Features.getConstArray(),
- _Features.getConstArray() + _Features.getLength(),
+ Features.getConstArray(),
+ Features.getConstArray() + Features.getLength(),
aFeatures.begin(),
FormFeatureToSlotId()
);
@@ -446,10 +446,10 @@ namespace svx
}
- void SAL_CALL FormControllerHelper::errorOccured( const SQLErrorEvent& _Event ) throw (RuntimeException, std::exception)
+ void SAL_CALL FormControllerHelper::errorOccured( const SQLErrorEvent& Event ) throw (RuntimeException, std::exception)
{
OSL_ENSURE( !m_aOperationError.hasValue(), "FormControllerHelper::errorOccurred: two errors during one operation?" );
- m_aOperationError = _Event.Reason;
+ m_aOperationError = Event.Reason;
}
diff --git a/svx/source/inc/fmvwimp.hxx b/svx/source/inc/fmvwimp.hxx
index 32d4459..bda4a41 100644
--- a/svx/source/inc/fmvwimp.hxx
+++ b/svx/source/inc/fmvwimp.hxx
@@ -109,10 +109,10 @@ public:
// XIndexAccess
virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 _Index) throw(css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 Index) throw(css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
// XFormControllerContext
- virtual void SAL_CALL makeVisible( const css::uno::Reference< css::awt::XControl >& _Control ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL makeVisible( const css::uno::Reference< css::awt::XControl >& Control ) throw (css::uno::RuntimeException, std::exception) override;
const ::std::vector< css::uno::Reference< css::form::runtime::XFormController > >& GetList() {return m_aControllerList;}
diff --git a/svx/source/inc/formcontroller.hxx b/svx/source/inc/formcontroller.hxx
index 1e862e9..1e1e611 100644
--- a/svx/source/inc/formcontroller.hxx
+++ b/svx/source/inc/formcontroller.hxx
@@ -252,15 +252,15 @@ namespace svxform
// XFilterController
virtual ::sal_Int32 SAL_CALL getFilterComponents() throw (css::uno::RuntimeException, std::exception) override;
virtual ::sal_Int32 SAL_CALL getDisjunctiveTerms() throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL addFilterControllerListener( const css::uno::Reference< css::form::runtime::XFilterControllerListener >& _Listener ) throw( css::uno::RuntimeException, std::exception ) override;
- virtual void SAL_CALL removeFilterControllerListener( const css::uno::Reference< css::form::runtime::XFilterControllerListener >& _Listener ) throw( css::uno::RuntimeException, std::exception ) override;
- virtual void SAL_CALL setPredicateExpression( ::sal_Int32 _Component, ::sal_Int32 _Term, const OUString& _PredicateExpression ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Reference< css::awt::XControl > SAL_CALL getFilterComponent( ::sal_Int32 _Component ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL addFilterControllerListener( const css::uno::Reference< css::form::runtime::XFilterControllerListener >& Listener ) throw( css::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL removeFilterControllerListener( const css::uno::Reference< css::form::runtime::XFilterControllerListener >& Listener ) throw( css::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL setPredicateExpression( ::sal_Int32 Component, ::sal_Int32 Term, const OUString& PredicateExpression ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::awt::XControl > SAL_CALL getFilterComponent( ::sal_Int32 Component ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
virtual css::uno::Sequence< css::uno::Sequence< OUString > > SAL_CALL getPredicateExpressions() throw( css::uno::RuntimeException, std::exception ) override;
- virtual void SAL_CALL removeDisjunctiveTerm( ::sal_Int32 _Term ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL removeDisjunctiveTerm( ::sal_Int32 Term ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL appendEmptyDisjunctiveTerm() throw (css::uno::RuntimeException, std::exception) override;
virtual ::sal_Int32 SAL_CALL getActiveTerm() throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setActiveTerm( ::sal_Int32 _ActiveTerm ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL setActiveTerm( ::sal_Int32 ActiveTerm ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
// XElementAccess
virtual css::uno::Type SAL_CALL getElementType() throw( css::uno::RuntimeException, std::exception ) override;
@@ -331,7 +331,7 @@ namespace svxform
virtual css::uno::Reference< css::awt::XControl> SAL_CALL getCurrentControl() throw( css::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL addActivateListener(const css::uno::Reference< css::form::XFormControllerListener>& l) throw( css::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL removeActivateListener(const css::uno::Reference< css::form::XFormControllerListener>& l) throw( css::uno::RuntimeException, std::exception ) override;
- virtual void SAL_CALL addChildController( const css::uno::Reference< css::form::runtime::XFormController >& _ChildController ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override;
+ virtual void SAL_CALL addChildController( const css::uno::Reference< css::form::runtime::XFormController >& ChildController ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override;
virtual css::uno::Reference< css::form::runtime::XFormControllerContext > SAL_CALL getContext() throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL setContext( const css::uno::Reference< css::form::runtime::XFormControllerContext >& _context ) throw (css::uno::RuntimeException, std::exception) override;
diff --git a/svx/source/inc/formcontrolling.hxx b/svx/source/inc/formcontrolling.hxx
index 74cc598..a24aab1 100644
--- a/svx/source/inc/formcontrolling.hxx
+++ b/svx/source/inc/formcontrolling.hxx
@@ -188,7 +188,7 @@ namespace svx
virtual void SAL_CALL invalidateAllFeatures() throw (css::uno::RuntimeException, std::exception) override;
// XSQLErrorListener
- virtual void SAL_CALL errorOccured( const css::sdb::SQLErrorEvent& _Event ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL errorOccured( const css::sdb::SQLErrorEvent& Event ) throw (css::uno::RuntimeException, std::exception) override;
// XEventListener
virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override;
diff --git a/svx/source/inc/gridcell.hxx b/svx/source/inc/gridcell.hxx
index 786c490..a460967 100644
--- a/svx/source/inc/gridcell.hxx
+++ b/svx/source/inc/gridcell.hxx
@@ -1043,18 +1043,18 @@ public:
virtual void SAL_CALL disposing() override;
// XComboBox
- virtual void SAL_CALL addItemListener( const css::uno::Reference< css::awt::XItemListener >& _Listener ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL removeItemListener( const css::uno::Reference< css::awt::XItemListener >& _Listener ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL addActionListener( const css::uno::Reference< css::awt::XActionListener >& _Listener ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL removeActionListener( const css::uno::Reference< css::awt::XActionListener >& _Listener ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL addItem( const OUString& _Item, ::sal_Int16 _Pos ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL addItems( const css::uno::Sequence< OUString >& _Items, ::sal_Int16 _Pos ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL addItemListener( const css::uno::Reference< css::awt::XItemListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL removeItemListener( const css::uno::Reference< css::awt::XItemListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL addActionListener( const css::uno::Reference< css::awt::XActionListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL removeActionListener( const css::uno::Reference< css::awt::XActionListener >& Listener ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL addItem( const OUString& Item, ::sal_Int16 Pos ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL addItems( const css::uno::Sequence< OUString >& Items, ::sal_Int16 Pos ) throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL removeItems( ::sal_Int16 nPos, ::sal_Int16 nCount ) throw (css::uno::RuntimeException, std::exception) override;
virtual ::sal_Int16 SAL_CALL getItemCount( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual OUString SAL_CALL getItem( ::sal_Int16 _Pos ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getItem( ::sal_Int16 Pos ) throw (css::uno::RuntimeException, std::exception) override;
virtual css::uno::Sequence< OUString > SAL_CALL getItems( ) throw (css::uno::RuntimeException, std::exception) override;
virtual ::sal_Int16 SAL_CALL getDropDownLineCount( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setDropDownLineCount( ::sal_Int16 _Lines ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL setDropDownLineCount( ::sal_Int16 Lines ) throw (css::uno::RuntimeException, std::exception) override;
protected:
virtual void onWindowEvent( const sal_uLong _nEventId, const vcl::Window& _rWindow, const void* _pEventData ) override;
commit 142997f2e91b4e9e994babcf3221ef07105e2cc6
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Apr 15 15:34:03 2016 +0200
Elide const vars
Change-Id: I859614f65afb783004ca9230d3d4bfc354b5afc5
diff --git a/svx/source/xml/xmlxtimp.cxx b/svx/source/xml/xmlxtimp.cxx
index f928804..e2c35de 100644
--- a/svx/source/xml/xmlxtimp.cxx
+++ b/svx/source/xml/xmlxtimp.cxx
@@ -65,14 +65,6 @@ using namespace com::sun::star::xml::sax;
using namespace ::xmloff::token;
using namespace cppu;
-sal_Char const sXML_np__office[] = "__office";
-sal_Char const sXML_np__office_ooo[] = "___office";
-sal_Char const sXML_np__draw[] = "__draw";
-sal_Char const sXML_np__draw_ooo[] = "___draw";
-sal_Char const sXML_np__ooo[] = "__ooo";
-sal_Char const sXML_np__xlink[] = "__xlink";
-
-
enum SvxXMLTableImportContextEnum { stice_unknown, stice_color, stice_marker, stice_dash, stice_hatch, stice_gradient, stice_bitmap };
@@ -327,16 +319,16 @@ SvxXMLXTableImport::SvxXMLXTableImport(
{
SetGraphicResolver( xGrfResolver );
- GetNamespaceMap().Add( sXML_np__ooo, GetXMLToken(XML_N_OOO), XML_NAMESPACE_OOO );
- GetNamespaceMap().Add( sXML_np__office, GetXMLToken(XML_N_OFFICE), XML_NAMESPACE_OFFICE );
- GetNamespaceMap().Add( sXML_np__draw, GetXMLToken(XML_N_DRAW), XML_NAMESPACE_DRAW );
- GetNamespaceMap().Add( sXML_np__xlink, GetXMLToken(XML_N_XLINK), XML_NAMESPACE_XLINK );
+ GetNamespaceMap().Add( "__ooo", GetXMLToken(XML_N_OOO), XML_NAMESPACE_OOO );
+ GetNamespaceMap().Add( "__office", GetXMLToken(XML_N_OFFICE), XML_NAMESPACE_OFFICE );
+ GetNamespaceMap().Add( "__draw", GetXMLToken(XML_N_DRAW), XML_NAMESPACE_DRAW );
+ GetNamespaceMap().Add( "__xlink", GetXMLToken(XML_N_XLINK), XML_NAMESPACE_XLINK );
// OOo namespaces for reading OOo 1.1 files
- GetNamespaceMap().Add( sXML_np__office_ooo,
+ GetNamespaceMap().Add( "___office",
GetXMLToken(XML_N_OFFICE_OOO),
XML_NAMESPACE_OFFICE );
- GetNamespaceMap().Add( sXML_np__draw_ooo,
+ GetNamespaceMap().Add( "___draw",
GetXMLToken(XML_N_DRAW_OOO),
XML_NAMESPACE_DRAW );
}
commit 234bb569e8eb3569b22b36043a1454e7fa170aab
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Apr 15 15:28:58 2016 +0200
Avoid reserved identifier
Change-Id: I527143a87c3793dc899ff25a73209e2997116b73
diff --git a/svx/source/unodraw/shapepropertynotifier.cxx b/svx/source/unodraw/shapepropertynotifier.cxx
index ff8bcff..3e36e70 100644
--- a/svx/source/unodraw/shapepropertynotifier.cxx
+++ b/svx/source/unodraw/shapepropertynotifier.cxx
@@ -33,9 +33,9 @@ namespace
struct ShapePropertyHash
{
- size_t operator()( svx::ShapeProperty __x ) const
+ size_t operator()( svx::ShapeProperty x ) const
{
- return size_t( __x );
+ return size_t( x );
}
};
}
commit 277193b12217e6ec1b49719d15a7e11d177f1a5c
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Apr 15 15:27:20 2016 +0200
Avoid reserved identifier (_CreateShape -> CreateShape)
Change-Id: Idcdd35302e60392fae9f63de1828e1a41ab89610
diff --git a/include/svx/fmdpage.hxx b/include/svx/fmdpage.hxx
index 027d218..1d55f53 100644
--- a/include/svx/fmdpage.hxx
+++ b/include/svx/fmdpage.hxx
@@ -39,7 +39,7 @@ protected:
// The following method is called when a SvxShape object should be created.
// Derived classes can create a derivation or an object aggregating SvxShape.
- virtual css::uno::Reference< css::drawing::XShape > _CreateShape( SdrObject *pObj ) const
+ virtual css::uno::Reference< css::drawing::XShape > CreateShape( SdrObject *pObj ) const
throw (css::uno::RuntimeException, std::exception) override;
public:
diff --git a/include/svx/unopage.hxx b/include/svx/unopage.hxx
index 831a6d6..808bba5 100644
--- a/include/svx/unopage.hxx
+++ b/include/svx/unopage.hxx
@@ -100,7 +100,7 @@ class SVX_DLLPUBLIC SvxDrawPage : public ::cppu::WeakAggImplHelper6< css::drawin
// The following method is called if a SvxShape object is to be created.
// Derived classes can create a derivation or an SvxShape aggregating object.
- virtual css::uno::Reference< css::drawing::XShape > _CreateShape( SdrObject *pObj ) const
+ virtual css::uno::Reference< css::drawing::XShape > CreateShape( SdrObject *pObj ) const
throw (css::uno::RuntimeException, std::exception);
UNO3_GETIMPLEMENTATION_DECL( SvxDrawPage )
diff --git a/reportdesign/source/core/inc/ReportDrawPage.hxx b/reportdesign/source/core/inc/ReportDrawPage.hxx
index 5328830..fa7127c 100644
--- a/reportdesign/source/core/inc/ReportDrawPage.hxx
+++ b/reportdesign/source/core/inc/ReportDrawPage.hxx
@@ -33,7 +33,7 @@ namespace reportdesign
protected:
virtual SdrObject *CreateSdrObject_( const css::uno::Reference< css::drawing::XShape > & xShape )
throw (css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Reference< css::drawing::XShape > _CreateShape( SdrObject *pObj ) const throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::drawing::XShape > CreateShape( SdrObject *pObj ) const throw (css::uno::RuntimeException, std::exception) override;
public:
OReportDrawPage(SdrPage* pPage,const css::uno::Reference< css::report::XSection >& _xSection);
virtual ~OReportDrawPage() throw(){}
diff --git a/reportdesign/source/core/sdr/ReportDrawPage.cxx b/reportdesign/source/core/sdr/ReportDrawPage.cxx
index 9dab4d8..1ce18f7 100644
--- a/reportdesign/source/core/sdr/ReportDrawPage.cxx
+++ b/reportdesign/source/core/sdr/ReportDrawPage.cxx
@@ -55,12 +55,12 @@ SdrObject* OReportDrawPage::CreateSdrObject_(const uno::Reference< drawing::XSha
return SvxDrawPage::CreateSdrObject_( xDescr );
}
-uno::Reference< drawing::XShape > OReportDrawPage::_CreateShape( SdrObject *pObj ) const
+uno::Reference< drawing::XShape > OReportDrawPage::CreateShape( SdrObject *pObj ) const
throw (uno::RuntimeException, std::exception)
{
OObjectBase* pBaseObj = dynamic_cast<OObjectBase*>(pObj);
if ( !pBaseObj )
- return SvxDrawPage::_CreateShape( pObj );
+ return SvxDrawPage::CreateShape( pObj );
uno::Reference< report::XSection> xSection = m_xSection;
uno::Reference< lang::XMultiServiceFactory> xFactory;
@@ -130,7 +130,7 @@ uno::Reference< drawing::XShape > OReportDrawPage::_CreateShape( SdrObject *pOb
}
if ( !xShape.is() )
- xShape.set( SvxDrawPage::_CreateShape( pObj ) );
+ xShape.set( SvxDrawPage::CreateShape( pObj ) );
try
{
diff --git a/sc/inc/pageuno.hxx b/sc/inc/pageuno.hxx
index ebf3b0a..08f087e 100644
--- a/sc/inc/pageuno.hxx
+++ b/sc/inc/pageuno.hxx
@@ -30,7 +30,7 @@ public:
ScPageObj(SdrPage* pPage);
virtual ~ScPageObj() throw();
- virtual css::uno::Reference<css::drawing::XShape> _CreateShape(SdrObject *pObj) const
+ virtual css::uno::Reference<css::drawing::XShape> CreateShape(SdrObject *pObj) const
throw (css::uno::RuntimeException, std::exception) override;
// XServiceInfo
diff --git a/sc/source/ui/unoobj/pageuno.cxx b/sc/source/ui/unoobj/pageuno.cxx
index 6ba7b31..a1566c7 100644
--- a/sc/source/ui/unoobj/pageuno.cxx
+++ b/sc/source/ui/unoobj/pageuno.cxx
@@ -33,10 +33,10 @@ ScPageObj::~ScPageObj() throw()
{
}
-uno::Reference<drawing::XShape > ScPageObj::_CreateShape( SdrObject *pObj ) const
+uno::Reference<drawing::XShape > ScPageObj::CreateShape( SdrObject *pObj ) const
throw (css::uno::RuntimeException, std::exception)
{
- uno::Reference<drawing::XShape> xShape(SvxFmDrawPage::_CreateShape( pObj ));
+ uno::Reference<drawing::XShape> xShape(SvxFmDrawPage::CreateShape( pObj ));
new ScShapeObj( xShape ); // aggregates object and modifies xShape
diff --git a/sd/source/ui/inc/unopage.hxx b/sd/source/ui/inc/unopage.hxx
index c741e58..b2f5b67 100644
--- a/sd/source/ui/inc/unopage.hxx
+++ b/sd/source/ui/inc/unopage.hxx
@@ -108,7 +108,7 @@ public:
throw (css::uno::RuntimeException, std::exception) override;
// SvxFmDrawPage
- virtual css::uno::Reference<css::drawing::XShape> _CreateShape(SdrObject *pObj) const
+ virtual css::uno::Reference<css::drawing::XShape> CreateShape(SdrObject *pObj) const
throw (css::uno::RuntimeException, std::exception) override;
// XInterface
diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx
index ea57ad8..1170d73 100644
--- a/sd/source/ui/unoidl/unopage.cxx
+++ b/sd/source/ui/unoidl/unopage.cxx
@@ -1408,11 +1408,11 @@ void SAL_CALL SdGenericDrawPage::firePropertiesChangeEvent( const Sequence< OUSt
{
}
-Reference< drawing::XShape > SdGenericDrawPage::_CreateShape(SdrObject *pObj) const
+Reference< drawing::XShape > SdGenericDrawPage::CreateShape(SdrObject *pObj) const
throw (RuntimeException, std::exception)
{
- DBG_ASSERT( GetPage(), "SdGenericDrawPage::_CreateShape(), can't create shape for disposed page!" );
- DBG_ASSERT( pObj, "SdGenericDrawPage::_CreateShape(), invalid call with pObj == 0!" );
+ DBG_ASSERT( GetPage(), "SdGenericDrawPage::CreateShape(), can't create shape for disposed page!" );
+ DBG_ASSERT( pObj, "SdGenericDrawPage::CreateShape(), invalid call with pObj == 0!" );
if (!pObj)
return Reference< drawing::XShape >();
@@ -1452,7 +1452,7 @@ Reference< drawing::XShape > SdGenericDrawPage::_CreateShape(SdrObject *pObj) c
Reference< drawing::XShape > xShape( pShape );
if(!xShape.is())
- xShape = SvxFmDrawPage::_CreateShape( pObj );
+ xShape = SvxFmDrawPage::CreateShape( pObj );
if( eKind != PRESOBJ_NONE )
{
@@ -1535,7 +1535,7 @@ Reference< drawing::XShape > SdGenericDrawPage::_CreateShape(SdrObject *pObj) c
}
else
{
- return SvxFmDrawPage::_CreateShape( pObj );
+ return SvxFmDrawPage::CreateShape( pObj );
}
}
diff --git a/svx/source/form/fmdpage.cxx b/svx/source/form/fmdpage.cxx
index e2a12d9..01aaed5 100644
--- a/svx/source/form/fmdpage.cxx
+++ b/svx/source/form/fmdpage.cxx
@@ -79,7 +79,7 @@ SdrObject *SvxFmDrawPage::CreateSdrObject_( const css::uno::Reference< css::draw
}
-css::uno::Reference< css::drawing::XShape > SvxFmDrawPage::_CreateShape( SdrObject *pObj ) const
+css::uno::Reference< css::drawing::XShape > SvxFmDrawPage::CreateShape( SdrObject *pObj ) const
throw (css::uno::RuntimeException, std::exception)
{
if( FmFormInventor == pObj->GetObjInventor() )
@@ -88,7 +88,7 @@ css::uno::Reference< css::drawing::XShape > SvxFmDrawPage::_CreateShape( SdrObj
return xShape;
}
else
- return SvxDrawPage::_CreateShape( pObj );
+ return SvxDrawPage::CreateShape( pObj );
}
// XFormsSupplier
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index 6ae45eb..612855e 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -2895,7 +2895,7 @@ css::uno::Reference< css::uno::XInterface > SdrObject::getUnoShape()
if( pDrawPage )
{
// create one
- xShape = pDrawPage->_CreateShape( this );
+ xShape = pDrawPage->CreateShape( this );
impl_setUnoShape( xShape );
}
}
diff --git a/svx/source/unodraw/unopage.cxx b/svx/source/unodraw/unopage.cxx
index 70e98fd..9e56776 100644
--- a/svx/source/unodraw/unopage.cxx
+++ b/svx/source/unodraw/unopage.cxx
@@ -785,7 +785,7 @@ SvxShape* SvxDrawPage::CreateShapeByTypeAndInventor( sal_uInt16 nType, sal_uInt3
}
default: // unknown inventor
{
- OSL_FAIL("AW: Unknown Inventor in SvxDrawPage::_CreateShape()");
+ OSL_FAIL("AW: Unknown Inventor in SvxDrawPage::CreateShape()");
break;
}
}
@@ -821,7 +821,7 @@ SvxShape* SvxDrawPage::CreateShapeByTypeAndInventor( sal_uInt16 nType, sal_uInt3
return pRet;
}
-Reference< drawing::XShape > SvxDrawPage::_CreateShape( SdrObject *pObj ) const
+Reference< drawing::XShape > SvxDrawPage::CreateShape( SdrObject *pObj ) const
throw (css::uno::RuntimeException, std::exception)
{
Reference< drawing::XShape > xShape( CreateShapeByTypeAndInventor(pObj->GetObjIdentifier(),
diff --git a/sw/inc/unodraw.hxx b/sw/inc/unodraw.hxx
index 21b4ba8..fc79a53 100644
--- a/sw/inc/unodraw.hxx
+++ b/sw/inc/unodraw.hxx
@@ -64,7 +64,7 @@ public:
// The following method is called when a SvxShape-object is to be created.
// Derived classes may obtain at this point a derivation or an object
// that is aggregating a SvxShape.
- virtual css::uno::Reference< css::drawing::XShape > _CreateShape( SdrObject *pObj ) const throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::drawing::XShape > CreateShape( SdrObject *pObj ) const throw (css::uno::RuntimeException, std::exception) override;
};
typedef cppu::WeakAggImplHelper4
diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx
index cf724ef..6c83023 100644
--- a/sw/source/core/unocore/unodraw.cxx
+++ b/sw/source/core/unocore/unodraw.cxx
@@ -300,7 +300,7 @@ SdrObject* SwFmDrawPage::CreateSdrObject_( const uno::Reference< drawing::XShape
return SvxFmDrawPage::CreateSdrObject_( xShape );
}
-uno::Reference< drawing::XShape > SwFmDrawPage::_CreateShape( SdrObject *pObj ) const
+uno::Reference< drawing::XShape > SwFmDrawPage::CreateShape( SdrObject *pObj ) const
throw (uno::RuntimeException, std::exception)
{
uno::Reference< drawing::XShape > xRet;
@@ -336,7 +336,7 @@ uno::Reference< drawing::XShape > SwFmDrawPage::_CreateShape( SdrObject *pObj )
}
else
{
- OSL_FAIL( "<SwFmDrawPage::_CreateShape(..)> - could not retrieve type. Thus, no shape created." );
+ OSL_FAIL( "<SwFmDrawPage::CreateShape(..)> - could not retrieve type. Thus, no shape created." );
return xRet;
}
}
@@ -346,7 +346,7 @@ uno::Reference< drawing::XShape > SwFmDrawPage::_CreateShape( SdrObject *pObj )
// own block - temporary object has to be destroyed before
// the delegator is set #81670#
{
- xRet = SvxFmDrawPage::_CreateShape( pObj );
+ xRet = SvxFmDrawPage::CreateShape( pObj );
}
uno::Reference< XUnoTunnel > xShapeTunnel(xRet, uno::UNO_QUERY);
//don't create an SwXShape if it already exists
commit ea83bf52953baa9b09771271e453a5f9a6c5280d
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Apr 15 15:23:08 2016 +0200
Avoid reserved identifier (_CreateSdrObject -> CreateSdrObject_)
Change-Id: Iee63999e4953a083783cb5c9811640150616472d
diff --git a/include/svx/fmdpage.hxx b/include/svx/fmdpage.hxx
index 189d5b3..027d218 100644
--- a/include/svx/fmdpage.hxx
+++ b/include/svx/fmdpage.hxx
@@ -34,7 +34,7 @@ protected:
// Creating a SdrObject based on a Description. Cann be used by derived classes to
// support own css::drawing::Shapes (for example Controls)
- virtual SdrObject *_CreateSdrObject( const css::uno::Reference< css::drawing::XShape > & xShape )
+ virtual SdrObject *CreateSdrObject_( const css::uno::Reference< css::drawing::XShape > & xShape )
throw (css::uno::RuntimeException, std::exception) override;
// The following method is called when a SvxShape object should be created.
diff --git a/include/svx/unopage.hxx b/include/svx/unopage.hxx
index 3464363..831a6d6 100644
--- a/include/svx/unopage.hxx
+++ b/include/svx/unopage.hxx
@@ -93,7 +93,7 @@ class SVX_DLLPUBLIC SvxDrawPage : public ::cppu::WeakAggImplHelper6< css::drawin
// Creating a SdrObject using it's Description.
// Can be used by derived classes to support their owen Shapes (e.g. Controls).
- virtual SdrObject *_CreateSdrObject( const css::uno::Reference< css::drawing::XShape >& xShape )
+ virtual SdrObject *CreateSdrObject_( const css::uno::Reference< css::drawing::XShape >& xShape )
throw (css::uno::RuntimeException, std::exception);
static SvxShape* CreateShapeByTypeAndInventor( sal_uInt16 nType, sal_uInt32 nInventor, SdrObject *pObj = nullptr, SvxDrawPage *pPage = nullptr, OUString const & referer = OUString() ) throw (css::uno::RuntimeException);
diff --git a/reportdesign/source/core/inc/ReportDrawPage.hxx b/reportdesign/source/core/inc/ReportDrawPage.hxx
index bf096cd..5328830 100644
--- a/reportdesign/source/core/inc/ReportDrawPage.hxx
+++ b/reportdesign/source/core/inc/ReportDrawPage.hxx
@@ -31,7 +31,7 @@ namespace reportdesign
OReportDrawPage(const OReportDrawPage&) = delete;
void operator =(const OReportDrawPage&) = delete;
protected:
- virtual SdrObject *_CreateSdrObject( const css::uno::Reference< css::drawing::XShape > & xShape )
+ virtual SdrObject *CreateSdrObject_( const css::uno::Reference< css::drawing::XShape > & xShape )
throw (css::uno::RuntimeException, std::exception) override;
virtual css::uno::Reference< css::drawing::XShape > _CreateShape( SdrObject *pObj ) const throw (css::uno::RuntimeException, std::exception) override;
public:
diff --git a/reportdesign/source/core/sdr/ReportDrawPage.cxx b/reportdesign/source/core/sdr/ReportDrawPage.cxx
index 7222511..9dab4d8 100644
--- a/reportdesign/source/core/sdr/ReportDrawPage.cxx
+++ b/reportdesign/source/core/sdr/ReportDrawPage.cxx
@@ -46,13 +46,13 @@ OReportDrawPage::OReportDrawPage(SdrPage* _pPage
{
}
-SdrObject* OReportDrawPage::_CreateSdrObject(const uno::Reference< drawing::XShape > & xDescr)
+SdrObject* OReportDrawPage::CreateSdrObject_(const uno::Reference< drawing::XShape > & xDescr)
throw (uno::RuntimeException, std::exception)
{
uno::Reference< report::XReportComponent> xReportComponent(xDescr,uno::UNO_QUERY);
if ( xReportComponent.is() )
return OObjectBase::createObject(xReportComponent);
- return SvxDrawPage::_CreateSdrObject( xDescr );
+ return SvxDrawPage::CreateSdrObject_( xDescr );
}
uno::Reference< drawing::XShape > OReportDrawPage::_CreateShape( SdrObject *pObj ) const
diff --git a/sd/source/ui/inc/unopage.hxx b/sd/source/ui/inc/unopage.hxx
index f9f83c4..c741e58 100644
--- a/sd/source/ui/inc/unopage.hxx
+++ b/sd/source/ui/inc/unopage.hxx
@@ -104,7 +104,7 @@ public:
virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override;
// this is called whenever a SdrObject must be created for a empty api shape wrapper
- virtual SdrObject *_CreateSdrObject( const css::uno::Reference< css::drawing::XShape >& xShape )
+ virtual SdrObject *CreateSdrObject_( const css::uno::Reference< css::drawing::XShape >& xShape )
throw (css::uno::RuntimeException, std::exception) override;
// SvxFmDrawPage
diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx
index d09b056..ea57ad8 100644
--- a/sd/source/ui/unoidl/unopage.cxx
+++ b/sd/source/ui/unoidl/unopage.cxx
@@ -388,7 +388,7 @@ SdXImpressDocument* SdGenericDrawPage::GetModel() const
}
// this is called whenever a SdrObject must be created for a empty api shape wrapper
-SdrObject * SdGenericDrawPage::_CreateSdrObject( const Reference< drawing::XShape >& xShape )
+SdrObject * SdGenericDrawPage::CreateSdrObject_( const Reference< drawing::XShape >& xShape )
throw (css::uno::RuntimeException, std::exception)
{
if( nullptr == SvxFmDrawPage::mpPage || !xShape.is() )
@@ -398,7 +398,7 @@ SdrObject * SdGenericDrawPage::_CreateSdrObject( const Reference< drawing::XShap
const OUString aPrefix( "com.sun.star.presentation." );
if( !aType.startsWith( aPrefix ) )
{
- SdrObject* pObj = SvxFmDrawPage::_CreateSdrObject( xShape );
+ SdrObject* pObj = SvxFmDrawPage::CreateSdrObject_( xShape );
if( pObj && ( (pObj->GetObjInventor() != SdrInventor) || (pObj->GetObjIdentifier() != OBJ_PAGE) ) )
{
SdDrawDocument* pDoc = static_cast<SdDrawDocument*>(GetPage()->GetModel());
@@ -510,7 +510,7 @@ SdrObject * SdGenericDrawPage::_CreateSdrObject( const Reference< drawing::XShap
SdrObject *pPresObj = nullptr;
if( (eObjKind == PRESOBJ_TABLE) || (eObjKind == PRESOBJ_MEDIA) )
{
- pPresObj = SvxFmDrawPage::_CreateSdrObject( xShape );
+ pPresObj = SvxFmDrawPage::CreateSdrObject_( xShape );
if( pPresObj )
{
SdDrawDocument* pDoc = static_cast<SdDrawDocument*>(GetPage()->GetModel());
diff --git a/svx/source/form/fmdpage.cxx b/svx/source/form/fmdpage.cxx
index dd5a845..e2a12d9 100644
--- a/svx/source/form/fmdpage.cxx
+++ b/svx/source/form/fmdpage.cxx
@@ -65,7 +65,7 @@ css::uno::Sequence< css::uno::Type > SAL_CALL SvxFmDrawPage::getTypes( ) throw(
return aTypes;
}
-SdrObject *SvxFmDrawPage::_CreateSdrObject( const css::uno::Reference< css::drawing::XShape > & xDescr )
+SdrObject *SvxFmDrawPage::CreateSdrObject_( const css::uno::Reference< css::drawing::XShape > & xDescr )
throw (css::uno::RuntimeException, std::exception)
{
OUString aShapeType( xDescr->getShapeType() );
@@ -75,7 +75,7 @@ SdrObject *SvxFmDrawPage::_CreateSdrObject( const css::uno::Reference< css::draw
)
return new FmFormObj();
else
- return SvxDrawPage::_CreateSdrObject( xDescr );
+ return SvxDrawPage::CreateSdrObject_( xDescr );
}
diff --git a/svx/source/unodraw/unopage.cxx b/svx/source/unodraw/unopage.cxx
index 3c104a9..70e98fd 100644
--- a/svx/source/unodraw/unopage.cxx
+++ b/svx/source/unodraw/unopage.cxx
@@ -487,7 +487,7 @@ void SAL_CALL SvxDrawPage::ungroup( const Reference< drawing::XShapeGroup >& aGr
mpModel->SetChanged();
}
-SdrObject *SvxDrawPage::_CreateSdrObject(const Reference< drawing::XShape > & xShape)
+SdrObject *SvxDrawPage::CreateSdrObject_(const Reference< drawing::XShape > & xShape)
throw (css::uno::RuntimeException, std::exception)
{
sal_uInt16 nType = 0;
@@ -833,7 +833,7 @@ Reference< drawing::XShape > SvxDrawPage::_CreateShape( SdrObject *pObj ) const
SdrObject *SvxDrawPage::CreateSdrObject( const Reference< drawing::XShape > & xShape, bool bBeginning ) throw()
{
- SdrObject* pObj = _CreateSdrObject( xShape );
+ SdrObject* pObj = CreateSdrObject_( xShape );
if( pObj)
{
pObj->SetModel(mpModel);
diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx
index e199513..e0dffd8 100644
--- a/svx/source/unodraw/unoshap2.cxx
+++ b/svx/source/unodraw/unoshap2.cxx
@@ -198,7 +198,7 @@ void SvxShapeGroup::addUnoShape( const uno::Reference< drawing::XShape >& xShape
SdrObject* pSdrShape = pShape->GetSdrObject();
if( pSdrShape == nullptr )
- pSdrShape = mxPage->_CreateSdrObject( xShape );
+ pSdrShape = mxPage->CreateSdrObject_( xShape );
if( pSdrShape->IsInserted() )
pSdrShape->GetObjList()->RemoveObject( pSdrShape->GetOrdNum() );
diff --git a/svx/source/unodraw/unoshap3.cxx b/svx/source/unodraw/unoshap3.cxx
index 9f5128f..da2b4ba 100644
--- a/svx/source/unodraw/unoshap3.cxx
+++ b/svx/source/unodraw/unoshap3.cxx
@@ -129,7 +129,7 @@ void SAL_CALL Svx3DSceneObject::add( const Reference< drawing::XShape >& xShape
if(!mpObj.is() || !mxPage.is() || pShape == nullptr || nullptr != pShape->GetSdrObject() )
throw uno::RuntimeException();
- SdrObject* pSdrShape = mxPage->_CreateSdrObject( xShape );
+ SdrObject* pSdrShape = mxPage->CreateSdrObject_( xShape );
if( dynamic_cast<const E3dObject* >(pSdrShape) != nullptr )
{
mpObj->GetSubList()->NbcInsertObject( pSdrShape );
diff --git a/sw/inc/unodraw.hxx b/sw/inc/unodraw.hxx
index 1f66b81..21b4ba8 100644
--- a/sw/inc/unodraw.hxx
+++ b/sw/inc/unodraw.hxx
@@ -46,7 +46,7 @@ protected:
// Create a SdrObject according to a description. Can be used by derived classes to
// support own css::drawing::Shapes (e.g. controls).
- virtual SdrObject *_CreateSdrObject( const css::uno::Reference< css::drawing::XShape > & xShape )
+ virtual SdrObject *CreateSdrObject_( const css::uno::Reference< css::drawing::XShape > & xShape )
throw (css::uno::RuntimeException, std::exception) override;
public:
diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx
index fa52beb..cf724ef 100644
--- a/sw/source/core/unocore/unodraw.cxx
+++ b/sw/source/core/unocore/unodraw.cxx
@@ -293,11 +293,11 @@ uno::Reference< uno::XInterface > SwFmDrawPage::GetInterface( SdrObject* pObj
return xShape;
}
-SdrObject* SwFmDrawPage::_CreateSdrObject( const uno::Reference< drawing::XShape > & xShape )
+SdrObject* SwFmDrawPage::CreateSdrObject_( const uno::Reference< drawing::XShape > & xShape )
throw (uno::RuntimeException, std::exception)
{
//FIXME: just a redirect call - can this method be deleted?
- return SvxFmDrawPage::_CreateSdrObject( xShape );
+ return SvxFmDrawPage::CreateSdrObject_( xShape );
}
uno::Reference< drawing::XShape > SwFmDrawPage::_CreateShape( SdrObject *pObj ) const
commit d9adda92cc6328cd44bf09753caefe23b028a81b
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Apr 13 23:14:26 2016 +0200
Ignore external code
Change-Id: Ie527703e9687a42bfc39439952b9d1a83d7cad24
diff --git a/compilerplugins/clang/plugin.cxx b/compilerplugins/clang/plugin.cxx
index c11c6ecc..04dcceb 100644
--- a/compilerplugins/clang/plugin.cxx
+++ b/compilerplugins/clang/plugin.cxx
@@ -42,7 +42,8 @@ bool Plugin::ignoreLocation( SourceLocation loc )
return true;
const char* bufferName = compiler.getSourceManager().getPresumedLoc( expansionLoc ).getFilename();
if( bufferName == NULL
- || strncmp( bufferName, WORKDIR, strlen( WORKDIR )) == 0 )
+ || strncmp( bufferName, WORKDIR, strlen( WORKDIR )) == 0
+ || strncmp( bufferName, SRCDIR "/external/", strlen( SRCDIR "/external/" )) == 0 )
return true;
if( strncmp( bufferName, BUILDDIR, strlen( BUILDDIR )) == 0
|| strncmp( bufferName, SRCDIR, strlen( SRCDIR )) == 0 )
commit e88136701a7f6e573b8c05ee209e8142f2e20ad6
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Apr 13 23:13:04 2016 +0200
Avoid reserved identifier
Change-Id: If0194bf8c888bc743b64984f6b655be4fe52aa1b
diff --git a/include/canvas/vclwrapper.hxx b/include/canvas/vclwrapper.hxx
index b3a2877..dcef39c 100644
--- a/include/canvas/vclwrapper.hxx
+++ b/include/canvas/vclwrapper.hxx
@@ -51,10 +51,10 @@ namespace canvas
member/method access is performed by operator-> instead of
the non-existing "operator.".
*/
- template< class _Wrappee > class VCLObject
+ template< class Wrappee_ > class VCLObject
{
public:
- typedef _Wrappee Wrappee;
+ typedef Wrappee_ Wrappee;
VCLObject() :
mpWrappee( new Wrappee() )
commit d13536228fff8c191af45446951d0662605da792
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Apr 13 23:12:48 2016 +0200
Avoid reserved identifier
Change-Id: I8b85f65e5d3e66aa93e161ce1895547d7d863ca1
diff --git a/fpicker/source/aqua/resourceprovider.mm b/fpicker/source/aqua/resourceprovider.mm
index d80f2f6..e687809 100644
--- a/fpicker/source/aqua/resourceprovider.mm
+++ b/fpicker/source/aqua/resourceprovider.mm
@@ -50,13 +50,13 @@ static const char* OTHER_RES_NAME = "svt";
// we have to translate control ids to resource ids
-struct _Entry
+struct Entry
{
sal_Int32 ctrlId;
sal_Int16 resId;
};
-_Entry CtrlIdToResIdTable[] = {
+Entry CtrlIdToResIdTable[] = {
{ CHECKBOX_AUTOEXTENSION, STR_SVT_FILEPICKER_AUTO_EXTENSION },
{ CHECKBOX_PASSWORD, STR_SVT_FILEPICKER_PASSWORD },
{ CHECKBOX_FILTEROPTIONS, STR_SVT_FILEPICKER_FILTER_OPTIONS },
@@ -74,7 +74,7 @@ _Entry CtrlIdToResIdTable[] = {
{ LISTBOX_FILTER_LABEL, STR_SVT_FILEPICKER_FILTER_TITLE}
};
-_Entry OtherCtrlIdToResIdTable[] = {
+Entry OtherCtrlIdToResIdTable[] = {
{ FILE_PICKER_TITLE_OPEN, STR_FILEDLG_OPEN },
{ FILE_PICKER_TITLE_SAVE, STR_FILEDLG_SAVE },
{ FILE_PICKER_FILE_TYPE, STR_FILEDLG_TYPE }
commit a6f229bb452e3f1ce43f6c893b00cef3c5503c21
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Apr 13 23:12:36 2016 +0200
Avoid reserved identifier
Change-Id: Ic1f02173e268934df2edbbb2ed752b4736c6e959
diff --git a/extensions/source/scanner/sane.cxx b/extensions/source/scanner/sane.cxx
index 5f218735..f1bff60 100644
--- a/extensions/source/scanner/sane.cxx
+++ b/extensions/source/scanner/sane.cxx
@@ -475,7 +475,7 @@ enum FrameStyleType {
#define BYTE_BUFFER_SIZE 32768
-static inline sal_uInt8 _ReadValue( FILE* fp, int depth )
+static inline sal_uInt8 ReadValue( FILE* fp, int depth )
{
if( depth == 16 )
{
@@ -799,7 +799,7 @@ bool Sane::Start( BitmapTransporter& rBitmap )
{
for( i = 0; i < (aParams.pixels_per_line); i++ )
{
- sal_uInt8 nGray = _ReadValue( pFrame, aParams.depth );
+ sal_uInt8 nGray = ReadValue( pFrame, aParams.depth );
aConverter.WriteUChar( nGray );
}
}
@@ -808,9 +808,9 @@ bool Sane::Start( BitmapTransporter& rBitmap )
for( i = 0; i < (aParams.pixels_per_line); i++ )
{
sal_uInt8 nRed, nGreen, nBlue;
- nRed = _ReadValue( pFrame, aParams.depth );
- nGreen = _ReadValue( pFrame, aParams.depth );
- nBlue = _ReadValue( pFrame, aParams.depth );
+ nRed = ReadValue( pFrame, aParams.depth );
+ nGreen = ReadValue( pFrame, aParams.depth );
+ nBlue = ReadValue( pFrame, aParams.depth );
aConverter.WriteUChar( nBlue );
aConverter.WriteUChar( nGreen );
aConverter.WriteUChar( nRed );
@@ -820,7 +820,7 @@ bool Sane::Start( BitmapTransporter& rBitmap )
{
for( i = 0; i < (aParams.pixels_per_line); i++ )
{
- sal_uInt8 nValue = _ReadValue( pFrame, aParams.depth );
+ sal_uInt8 nValue = ReadValue( pFrame, aParams.depth );
switch( aParams.format )
{
case SANE_FRAME_RED:
commit 991e3cefad97cbb6e349013c6e541504e26a9082
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Apr 13 23:12:14 2016 +0200
Avoid reserved identifiers
Change-Id: I2b0fe700057fea790e8b5d651770b27f0a553fbf
diff --git a/dbaccess/source/core/dataaccess/connection.cxx b/dbaccess/source/core/dataaccess/connection.cxx
index 7fcd857..9b170bd 100644
--- a/dbaccess/source/core/dataaccess/connection.cxx
+++ b/dbaccess/source/core/dataaccess/connection.cxx
@@ -790,13 +790,13 @@ void OConnection::impl_checkTableQueryNames_nothrow()
}
}
-Reference< XGraphic > SAL_CALL OConnection::getTableIcon( const OUString& _TableName, ::sal_Int32 _ColorMode ) throw (RuntimeException, std::exception)
+Reference< XGraphic > SAL_CALL OConnection::getTableIcon( const OUString& TableName, ::sal_Int32 ColorMode ) throw (RuntimeException, std::exception)
{
Reference< XGraphic > xReturn;
// ask our aggregate
if ( m_xTableUIProvider.is() )
- xReturn = m_xTableUIProvider->getTableIcon( _TableName, _ColorMode );
+ xReturn = m_xTableUIProvider->getTableIcon( TableName, ColorMode );
// ask ourself
// well, we don't have own functionality here ...
@@ -806,13 +806,13 @@ Reference< XGraphic > SAL_CALL OConnection::getTableIcon( const OUString& _Table
return xReturn;
}
-Reference< XInterface > SAL_CALL OConnection::getTableEditor( const Reference< XDatabaseDocumentUI >& _DocumentUI, const OUString& _TableName ) throw (IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception)
+Reference< XInterface > SAL_CALL OConnection::getTableEditor( const Reference< XDatabaseDocumentUI >& DocumentUI, const OUString& TableName ) throw (IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception)
{
Reference< XInterface > xReturn;
// ask our aggregate
if ( m_xTableUIProvider.is() )
- xReturn = m_xTableUIProvider->getTableEditor( _DocumentUI, _TableName );
+ xReturn = m_xTableUIProvider->getTableEditor( DocumentUI, TableName );
// ask ourself
// well, we don't have own functionality here ...
diff --git a/dbaccess/source/core/dataaccess/databasecontext.cxx b/dbaccess/source/core/dataaccess/databasecontext.cxx
index 9c28241..f624600 100644
--- a/dbaccess/source/core/dataaccess/databasecontext.cxx
+++ b/dbaccess/source/core/dataaccess/databasecontext.cxx
@@ -540,9 +540,9 @@ void ODatabaseContext::revokeObject(const OUString& _rName) throw( Exception, Ru
m_aContainerListeners.notifyEach( &XContainerListener::elementRemoved, aEvent );
}
-sal_Bool SAL_CALL ODatabaseContext::hasRegisteredDatabase( const OUString& _Name ) throw (IllegalArgumentException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseContext::hasRegisteredDatabase( const OUString& Name ) throw (IllegalArgumentException, RuntimeException, std::exception)
{
- return m_xDatabaseRegistrations->hasRegisteredDatabase( _Name );
+ return m_xDatabaseRegistrations->hasRegisteredDatabase( Name );
}
Sequence< OUString > SAL_CALL ODatabaseContext::getRegistrationNames() throw (RuntimeException, std::exception)
@@ -550,39 +550,39 @@ Sequence< OUString > SAL_CALL ODatabaseContext::getRegistrationNames() throw (Ru
return m_xDatabaseRegistrations->getRegistrationNames();
}
-OUString SAL_CALL ODatabaseContext::getDatabaseLocation( const OUString& _Name ) throw (IllegalArgumentException, NoSuchElementException, RuntimeException, std::exception)
+OUString SAL_CALL ODatabaseContext::getDatabaseLocation( const OUString& Name ) throw (IllegalArgumentException, NoSuchElementException, RuntimeException, std::exception)
{
- return m_xDatabaseRegistrations->getDatabaseLocation( _Name );
+ return m_xDatabaseRegistrations->getDatabaseLocation( Name );
}
-void SAL_CALL ODatabaseContext::registerDatabaseLocation( const OUString& _Name, const OUString& _Location ) throw (IllegalArgumentException, ElementExistException, RuntimeException, std::exception)
+void SAL_CALL ODatabaseContext::registerDatabaseLocation( const OUString& Name, const OUString& Location ) throw (IllegalArgumentException, ElementExistException, RuntimeException, std::exception)
{
- m_xDatabaseRegistrations->registerDatabaseLocation( _Name, _Location );
+ m_xDatabaseRegistrations->registerDatabaseLocation( Name, Location );
}
-void SAL_CALL ODatabaseContext::revokeDatabaseLocation( const OUString& _Name ) throw (IllegalArgumentException, NoSuchElementException, IllegalAccessException, RuntimeException, std::exception)
+void SAL_CALL ODatabaseContext::revokeDatabaseLocation( const OUString& Name ) throw (IllegalArgumentException, NoSuchElementException, IllegalAccessException, RuntimeException, std::exception)
{
- m_xDatabaseRegistrations->revokeDatabaseLocation( _Name );
+ m_xDatabaseRegistrations->revokeDatabaseLocation( Name );
}
-void SAL_CALL ODatabaseContext::changeDatabaseLocation( const OUString& _Name, const OUString& _NewLocation ) throw (IllegalArgumentException, NoSuchElementException, IllegalAccessException, RuntimeException, std::exception)
+void SAL_CALL ODatabaseContext::changeDatabaseLocation( const OUString& Name, const OUString& NewLocation ) throw (IllegalArgumentException, NoSuchElementException, IllegalAccessException, RuntimeException, std::exception)
{
- m_xDatabaseRegistrations->changeDatabaseLocation( _Name, _NewLocation );
+ m_xDatabaseRegistrations->changeDatabaseLocation( Name, NewLocation );
}
-sal_Bool SAL_CALL ODatabaseContext::isDatabaseRegistrationReadOnly( const OUString& _Name ) throw (IllegalArgumentException, NoSuchElementException, RuntimeException, std::exception)
+sal_Bool SAL_CALL ODatabaseContext::isDatabaseRegistrationReadOnly( const OUString& Name ) throw (IllegalArgumentException, NoSuchElementException, RuntimeException, std::exception)
{
- return m_xDatabaseRegistrations->isDatabaseRegistrationReadOnly( _Name );
+ return m_xDatabaseRegistrations->isDatabaseRegistrationReadOnly( Name );
}
-void SAL_CALL ODatabaseContext::addDatabaseRegistrationsListener( const Reference< XDatabaseRegistrationsListener >& _Listener ) throw (RuntimeException, std::exception)
+void SAL_CALL ODatabaseContext::addDatabaseRegistrationsListener( const Reference< XDatabaseRegistrationsListener >& Listener ) throw (RuntimeException, std::exception)
{
- m_xDatabaseRegistrations->addDatabaseRegistrationsListener( _Listener );
+ m_xDatabaseRegistrations->addDatabaseRegistrationsListener( Listener );
}
-void SAL_CALL ODatabaseContext::removeDatabaseRegistrationsListener( const Reference< XDatabaseRegistrationsListener >& _Listener ) throw (RuntimeException, std::exception)
+void SAL_CALL ODatabaseContext::removeDatabaseRegistrationsListener( const Reference< XDatabaseRegistrationsListener >& Listener ) throw (RuntimeException, std::exception)
{
- m_xDatabaseRegistrations->removeDatabaseRegistrationsListener( _Listener );
+ m_xDatabaseRegistrations->removeDatabaseRegistrationsListener( Listener );
}
// css::container::XElementAccess
diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx b/dbaccess/source/core/dataaccess/databasedocument.cxx
index 2922e8e..ad56a86 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.cxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.cxx
@@ -542,14 +542,14 @@ void SAL_CALL ODatabaseDocument::initNew( ) throw (DoubleInitializationExceptio
impl_notifyStorageChange_nolck_nothrow( xTempStor );
}
-void SAL_CALL ODatabaseDocument::load( const Sequence< PropertyValue >& _Arguments ) throw (DoubleInitializationException, IOException, Exception, RuntimeException, std::exception)
+void SAL_CALL ODatabaseDocument::load( const Sequence< PropertyValue >& Arguments ) throw (DoubleInitializationException, IOException, Exception, RuntimeException, std::exception)
{
// SYNCHRONIZED ->
DocumentGuard aGuard( *this, DocumentGuard::InitMethod );
impl_reset_nothrow();
- ::comphelper::NamedValueCollection aResource( _Arguments );
+ ::comphelper::NamedValueCollection aResource( Arguments );
if ( aResource.has( "FileName" ) && !aResource.has( "URL" ) )
// FileName is the compatibility name for URL, so we might have clients passing
// a FileName only. However, some of our code works with the URL only, so ensure
@@ -1345,43 +1345,43 @@ void ODatabaseDocument::impl_setModified_nothrow( bool _bModified, DocumentGuard
}
// css::document::XEventBroadcaster
-void SAL_CALL ODatabaseDocument::addEventListener(const uno::Reference< document::XEventListener >& _Listener ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ODatabaseDocument::addEventListener(const uno::Reference< document::XEventListener >& Listener ) throw (uno::RuntimeException, std::exception)
{
- m_aEventNotifier.addLegacyEventListener( _Listener );
+ m_aEventNotifier.addLegacyEventListener( Listener );
}
-void SAL_CALL ODatabaseDocument::removeEventListener( const uno::Reference< document::XEventListener >& _Listener ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ODatabaseDocument::removeEventListener( const uno::Reference< document::XEventListener >& Listener ) throw (uno::RuntimeException, std::exception)
{
- m_aEventNotifier.removeLegacyEventListener( _Listener );
+ m_aEventNotifier.removeLegacyEventListener( Listener );
}
-void SAL_CALL ODatabaseDocument::addDocumentEventListener( const Reference< XDocumentEventListener >& _Listener ) throw (RuntimeException, std::exception)
+void SAL_CALL ODatabaseDocument::addDocumentEventListener( const Reference< XDocumentEventListener >& Listener ) throw (RuntimeException, std::exception)
{
- m_aEventNotifier.addDocumentEventListener( _Listener );
+ m_aEventNotifier.addDocumentEventListener( Listener );
}
-void SAL_CALL ODatabaseDocument::removeDocumentEventListener( const Reference< XDocumentEventListener >& _Listener ) throw (RuntimeException, std::exception)
+void SAL_CALL ODatabaseDocument::removeDocumentEventListener( const Reference< XDocumentEventListener >& Listener ) throw (RuntimeException, std::exception)
{
- m_aEventNotifier.removeDocumentEventListener( _Listener );
+ m_aEventNotifier.removeDocumentEventListener( Listener );
}
-void SAL_CALL ODatabaseDocument::notifyDocumentEvent( const OUString& _EventName, const Reference< XController2 >& _ViewController, const Any& _Supplement ) throw (IllegalArgumentException, NoSupportException, RuntimeException, std::exception)
+void SAL_CALL ODatabaseDocument::notifyDocumentEvent( const OUString& EventName, const Reference< XController2 >& ViewController, const Any& Supplement ) throw (IllegalArgumentException, NoSupportException, RuntimeException, std::exception)
{
- if ( _EventName.isEmpty() )
+ if ( EventName.isEmpty() )
throw IllegalArgumentException( OUString(), *this, 1 );
// SYNCHRONIZED ->
DocumentGuard aGuard(*this, DocumentGuard::DefaultMethod);
- if ( !DocumentEvents::needsSynchronousNotification( _EventName ) )
+ if ( !DocumentEvents::needsSynchronousNotification( EventName ) )
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list